Make all storage location explicit children of MEDIA_ROOT.

Signed-off-by: Eric Riggs <ericriggs42@gmail.com>
This commit is contained in:
Eric Riggs
2018-04-22 04:15:38 -04:00
parent d8941ea810
commit bbc338120e
3 changed files with 19 additions and 6 deletions

View File

@@ -43,7 +43,9 @@ setting_shared_storage = namespace.add_setting(
)
setting_shared_storage_arguments = namespace.add_setting(
global_name='COMMON_SHARED_STORAGE_ARGUMENTS',
default='{location: mayan/media/shared_files}',
default='{{location: {}}}'.format(
os.path.join(settings.MEDIA_ROOT, 'shared_files')
)
)
setting_temporary_directory = namespace.add_setting(
global_name='COMMON_TEMPORARY_DIRECTORY', default=tempfile.gettempdir(),
@@ -55,7 +57,7 @@ setting_temporary_directory = namespace.add_setting(
)
setting_production_error_log_path = namespace.add_setting(
global_name='COMMON_PRODUCTION_ERROR_LOG_PATH',
default=os.path.join(settings.BASE_DIR, 'error.log'), help_text=_(
default=os.path.join(settings.MEDIA_ROOT, 'error.log'), help_text=_(
'Path to the logfile that will track errors during production.'
),
is_path=True

View File

@@ -1,5 +1,8 @@
from __future__ import unicode_literals
import os
from django.conf import settings
from django.utils.translation import ugettext_lazy as _
from smart_settings import Namespace
@@ -11,5 +14,7 @@ setting_storage_backend = namespace.add_setting(
)
setting_storage_backend_arguments = namespace.add_setting(
global_name='SIGNATURES_STORAGE_BACKEND_ARGUMENTS',
default='{location: mayan/media/document_storage}'
default='{{location: {}}}'.format(
os.path.join(settings.MEDIA_ROOT, 'document_signatures')
)
)

View File

@@ -1,7 +1,10 @@
from __future__ import unicode_literals
import os
import pycountry
from django.conf import settings
from django.utils.translation import ugettext_lazy as _
from smart_settings import Namespace
@@ -10,7 +13,6 @@ LANGUAGE_CHOICES = [
(i.iso639_3_code, i.name) for i in list(pycountry.languages)
]
namespace = Namespace(name='documents', label=_('Documents'))
setting_display_width = namespace.add_setting(
global_name='DOCUMENTS_DISPLAY_WIDTH', default='3600'
@@ -49,7 +51,9 @@ setting_storage_backend = namespace.add_setting(
)
setting_storage_backend_arguments = namespace.add_setting(
global_name='DOCUMENTS_STORAGE_BACKEND_ARGUMENTS',
default='{location: mayan/media/document_storage}'
default='{{location: {}}}'.format(
os.path.join(settings.MEDIA_ROOT, 'document_storage')
)
)
setting_zoom_percent_step = namespace.add_setting(
global_name='DOCUMENTS_ZOOM_PERCENT_STEP', default=25,
@@ -84,7 +88,9 @@ setting_documentimagecache_storage = namespace.add_setting(
)
setting_documentimagecache_storage_arguments = namespace.add_setting(
global_name='DOCUMENTS_CACHE_STORAGE_BACKEND_ARGUMENTS',
default='{location: mayan/media/document_cache}'
default='{{location: {}}}'.format(
os.path.join(settings.MEDIA_ROOT, 'document_cache')
)
)
setting_language = namespace.add_setting(
global_name='DOCUMENTS_LANGUAGE', default='eng',