From bbc338120e1064f4a9f3e97d3fad6628f0900da9 Mon Sep 17 00:00:00 2001 From: Eric Riggs Date: Sun, 22 Apr 2018 04:15:38 -0400 Subject: [PATCH] Make all storage location explicit children of MEDIA_ROOT. Signed-off-by: Eric Riggs --- mayan/apps/common/settings.py | 6 ++++-- mayan/apps/document_signatures/settings.py | 7 ++++++- mayan/apps/documents/settings.py | 12 +++++++++--- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/mayan/apps/common/settings.py b/mayan/apps/common/settings.py index e8a8d45abb..4d33f32234 100644 --- a/mayan/apps/common/settings.py +++ b/mayan/apps/common/settings.py @@ -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 diff --git a/mayan/apps/document_signatures/settings.py b/mayan/apps/document_signatures/settings.py index 962b00ee2c..18525cd39d 100644 --- a/mayan/apps/document_signatures/settings.py +++ b/mayan/apps/document_signatures/settings.py @@ -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') + ) ) diff --git a/mayan/apps/documents/settings.py b/mayan/apps/documents/settings.py index 81ef69ce13..7c233b8068 100644 --- a/mayan/apps/documents/settings.py +++ b/mayan/apps/documents/settings.py @@ -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',