diff --git a/conf/manage.py b/conf/manage.py index 5451027..a85e3b1 100755 --- a/conf/manage.py +++ b/conf/manage.py @@ -5,7 +5,7 @@ import sys def main(): - os.environ['DJANGO_SETTINGS_MODULE'] = 'django_ynh_demo_settings' + os.environ['DJANGO_SETTINGS_MODULE'] = 'settings' from django.core.management import execute_from_command_line execute_from_command_line(sys.argv) diff --git a/conf/django_ynh_demo_settings.py b/conf/settings.py similarity index 99% rename from conf/django_ynh_demo_settings.py rename to conf/settings.py index afecb94..e28d35b 100644 --- a/conf/django_ynh_demo_settings.py +++ b/conf/settings.py @@ -37,9 +37,6 @@ PATH_URL = PATH_URL.strip('/') # ----------------------------------------------------------------------------- - -ROOT_URLCONF = 'django_ynh_demo_urls' - YNH_SETUP_USER = 'setup_user.setup_demo_user' SECRET_KEY = __get_or_create_secret(FINAL_HOME_PATH / 'secret.txt') # /opt/yunohost/$app/secret.txt diff --git a/conf/django_ynh_demo_urls.py b/conf/urls.py similarity index 100% rename from conf/django_ynh_demo_urls.py rename to conf/urls.py diff --git a/conf/wsgi.py b/conf/wsgi.py index 70d2e49..1e7a099 100644 --- a/conf/wsgi.py +++ b/conf/wsgi.py @@ -2,9 +2,7 @@ WSGI config """ import os - - -os.environ['DJANGO_SETTINGS_MODULE'] = 'django_ynh_demo_settings' +os.environ['DJANGO_SETTINGS_MODULE'] = 'settings' from django.core.wsgi import get_wsgi_application diff --git a/django_ynh/base_settings.py b/django_ynh/base_settings.py index fd8cef5..32dea60 100644 --- a/django_ynh/base_settings.py +++ b/django_ynh/base_settings.py @@ -7,11 +7,12 @@ # ----------------------------------------------------------------------------- # settings that should be set in project settings: -ROOT_URLCONF = None SECRET_KEY = None # ----------------------------------------------------------------------------- +ROOT_URLCONF = 'urls' # .../conf/urls.py + INSTALLED_APPS = [ 'django.contrib.admin', 'django.contrib.auth', diff --git a/scripts/install b/scripts/install index d7fa3ef..6578d2c 100755 --- a/scripts/install +++ b/scripts/install @@ -155,8 +155,7 @@ ynh_app_setting_set --app="$app" --key=redis_db --value="$redis_db" touch "$final_path/local_settings.py" -cp "../conf/ynh_authenticate.py" "$final_path/ynh_authenticate.py" -cp "../conf/ynh_urls.py" "$final_path/ynh_urls.py" +cp "../conf/urls.py" "$final_path/urls.py" #================================================= # MIGRATE / COLLECTSTATIC / CREATEADMIN diff --git a/scripts/upgrade b/scripts/upgrade index f1f1419..b57109f 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -143,8 +143,7 @@ ynh_store_file_checksum --file="$settings" touch "$final_path/local_settings.py" -cp "../conf/ynh_authenticate.py" "$final_path/ynh_authenticate.py" -cp "../conf/ynh_urls.py" "$final_path/ynh_urls.py" +cp "../conf/urls.py" "$final_path/urls.py" #================================================= # MIGRATE django_ynh