diff --git a/scripts/install b/scripts/install index d12b2b1..5db9579 100644 --- a/scripts/install +++ b/scripts/install @@ -50,7 +50,7 @@ ynh_add_nginx_config # SETUP SQL CREDENTIALS #================================================= -ynh_add_config --template="../conf/common.php" --destination="$install_dir/protected/config/common.php" +ynh_add_config --template="common.php" --destination="$install_dir/protected/config/common.php" #================================================= # DEACTIVATE DEBUG MODE @@ -133,7 +133,7 @@ chown -R $app:www-data "$install_dir" #================================================= ynh_script_progression --message="Setuping crontab..." --weight=1 -ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/${app}" +ynh_add_config --template="cron" --destination="/etc/cron.d/${app}" #================================================= # END OF SCRIPT diff --git a/scripts/remove b/scripts/remove index fca489d..e2b70a3 100644 --- a/scripts/remove +++ b/scripts/remove @@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing NGINX web server configuration..." --weight=2 +ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 # Remove the dedicated NGINX config ynh_remove_nginx_config diff --git a/scripts/upgrade b/scripts/upgrade index 324cad9..74eb7b8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -23,19 +23,19 @@ upgrade_type=$(ynh_check_app_version_changed) ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 # If fpm_footprint doesn't exist, create it -if [ -z "$fpm_footprint" ]; then +if [ -z "${fpm_footprint:-}" ]; then fpm_footprint=low ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint fi # If fpm_free_footprint doesn't exist, create it -if [ -z "$fpm_free_footprint" ]; then +if [ -z "${fpm_free_footprint:-}" ]; then fpm_free_footprint=0 ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint fi # If fpm_usage doesn't exist, create it -if [ -z "$fpm_usage" ]; then +if [ -z "${fpm_usage:-}" ]; then fpm_usage=low ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage fi @@ -109,7 +109,7 @@ then else current_version=$(cat $install_dir/$HUMHUB_AUTH_BASIC_PATH/module.json | jq -j '.version') if [ "$current_version" != "$HUMHUB_AUTH_BASIC_VERSION" ]; then -#REMOVEME? ynh_secure_remove $install_dir/$HUMHUB_AUTH_BASIC_PATH + ynh_secure_remove $install_dir/$HUMHUB_AUTH_BASIC_PATH install_sso fi fi @@ -140,7 +140,7 @@ chown -R $app:www-data "$install_dir" #================================================= ynh_script_progression --message="Upgrading crontab..." --weight=1 -ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/${app}" +ynh_add_config --template="cron" --destination="/etc/cron.d/${app}" #================================================= # END OF SCRIPT