diff --git a/check_process b/check_process index 0d613e1..cca0046 100644 --- a/check_process +++ b/check_process @@ -10,7 +10,7 @@ setup_sub_dir=1 setup_root=1 setup_nourl=0 - setup_private=0 + setup_private=1 setup_public=1 upgrade=1 upgrade=1 from_commit=61398d8e49d4de8e7425c4ccd8098d5a4c55994b diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index 17fbe0a..797f1f1 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1 +1 @@ -Opensondage is an online service for planning an appointment or making a decision quickly and easily. No registration is required. \ No newline at end of file +OpenSondage is an online service for planning an appointment or making a decision quickly and easily. No registration is required. \ No newline at end of file diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md index 6f84764..862aceb 100644 --- a/doc/DESCRIPTION_fr.md +++ b/doc/DESCRIPTION_fr.md @@ -1 +1 @@ -Opensondage est un service en ligne permettant de planifier un rendez-vous ou prendre des décisions rapidement et simplement. Aucune inscription préalable n’est nécessaire. \ No newline at end of file +OpenSondage est un service en ligne permettant de planifier un rendez-vous ou prendre des décisions rapidement et simplement. Aucune inscription préalable n’est nécessaire. \ No newline at end of file diff --git a/scripts/upgrade b/scripts/upgrade index f59b094..dbfa210 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -53,24 +53,6 @@ ynh_abort_if_errors #================================================= ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 -if [ -z "$is_public" ]; then - is_public=$(ynh_app_setting_get --app=$app --key=public_site) - ynh_app_setting_set --app=$app --key=is_public --value=$is_public - ynh_app_setting_delete --app=$app --key=public_site -fi - -# Cleaning legacy permissions -if ynh_legacy_permissions_exists; then - ynh_legacy_permissions_delete_all - - ynh_app_setting_delete --app=$app --key=is_public -fi - -if ! ynh_permission_exists --permission="admin"; then - # Create the required permissions - ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin -fi - # If db_name doesn't exist, create it if [ -z "$db_name" ]; then db_name=$(ynh_sanitize_dbid --db_name=$app) @@ -100,6 +82,18 @@ if [ -z "$path_url" ]; then ynh_app_setting_delete --app=$app --key=path_url fi +# Cleaning legacy permissions +if ynh_legacy_permissions_exists; then + ynh_legacy_permissions_delete_all + + ynh_app_setting_delete --app=$app --key=is_public +fi + +if ! ynh_permission_exists --permission="admin"; then + # Create the required permissions + ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin +fi + #================================================= # CREATE DEDICATED USER #================================================= @@ -160,8 +154,8 @@ then ynh_script_progression --message="Reconfiguring $app..." --weight=2 ynh_add_config --template="../conf/config.php" --destination="$final_path/app/inc/config.php" - chmod 400 "$final_path/app/inc/config.php" - chown $app:$app "$final_path/app/inc/config.php" + chmod 400 "$final_path/app/inc/config.php" + chown $app:$app "$final_path/app/inc/config.php" fi #=================================================