diff --git a/manifest.json b/manifest.json index 5030dc8..9b95b52 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Glue code to package django projects as yunohost apps." }, - "version": "0.1.2rc1~ynh1", + "version": "0.1.2rc1~ynh2", "url": "https://github.com/jedie/django_ynh", "license": "GPL-3.0", "maintainer": { diff --git a/scripts/install b/scripts/install index a9014cc..e48af2a 100755 --- a/scripts/install +++ b/scripts/install @@ -132,8 +132,6 @@ ynh_store_file_checksum --file="$gunicorn_conf" cp ../conf/manage.py "$final_path/manage.py" chmod +x "$final_path/manage.py" -cp ../conf/wsgi.py "$final_path/wsgi.py" - settings="$final_path/settings.py" cp "../conf/settings.py" "$settings" @@ -154,9 +152,12 @@ ynh_store_file_checksum --file="$settings" ynh_app_setting_set --app="$app" --key=redis_db --value="$redis_db" +cp ../conf/setup_user.py "$final_path/setup_user.py" +cp ../conf/urls.py "$final_path/urls.py" +cp ../conf/wsgi.py "$final_path/wsgi.py" + touch "$final_path/local_settings.py" -cp "../conf/urls.py" "$final_path/urls.py" #================================================= # MIGRATE / COLLECTSTATIC / CREATE SUPERUSER diff --git a/scripts/upgrade b/scripts/upgrade index d5578b9..69c0bce 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -118,9 +118,6 @@ ynh_backup_if_checksum_is_different --file="$final_path/manage.py" cp ../conf/manage.py "$final_path/manage.py" chmod +x "$final_path/manage.py" -ynh_backup_if_checksum_is_different --file="$final_path/wsgi.py" -cp ../conf/wsgi.py "$final_path/wsgi.py" - # save old settings file settings="$final_path/settings.py" ynh_backup_if_checksum_is_different --file="$settings" @@ -142,9 +139,17 @@ ynh_replace_string --match_string="__PATH_URL__" --replace_string="$path_url" -- # Recalculate and store the config file checksum into the app settings ynh_store_file_checksum --file="$settings" +ynh_backup_if_checksum_is_different --file="$final_path/setup_user.py" +cp ../conf/setup_user.py "$final_path/setup_user.py" + +ynh_backup_if_checksum_is_different --file="$final_path/urls.py" +cp ../conf/urls.py "$final_path/urls.py" + +ynh_backup_if_checksum_is_different --file="$final_path/wsgi.py" +cp ../conf/wsgi.py "$final_path/wsgi.py" + touch "$final_path/local_settings.py" -cp "../conf/urls.py" "$final_path/urls.py" #================================================= # MIGRATE / COLLECTSTATIC / CREATE SUPERUSER