diff --git a/scripts/install b/scripts/install index 492187c..b367332 100644 --- a/scripts/install +++ b/scripts/install @@ -173,7 +173,8 @@ ynh_use_logrotate --logfile=$final_path/app/data/_data_/_default_/logs/fail2ban/ # Set permissions to app files find $final_path/. -type d -exec chmod 755 {} \; find $final_path/. -type f -exec chmod 644 {} \; -chown -R $app: $final_path +chmod -R o-rwx $final_path +chown -R $app:www-data $final_path #================================================= # SETUP FAIL2BAN diff --git a/scripts/remove b/scripts/remove index b3b3237..1bd247c 100644 --- a/scripts/remove +++ b/scripts/remove @@ -41,7 +41,7 @@ ynh_remove_app_dependencies #================================================= # REMOVE APP MAIN DIR #================================================= -ynh_script_progression --message="Removing the app main directory..." +ynh_script_progression --message="Removing the app main directory..." --weight=1 # Remove the app directory securely ynh_secure_remove --file="$final_path" @@ -49,7 +49,7 @@ ynh_secure_remove --file="$final_path" #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing NGINX web server configuration..." +ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 # Remove the dedicated NGING config ynh_remove_nginx_config @@ -65,7 +65,7 @@ ynh_remove_fpm_config #================================================= # REMOVE LOGROTATE CONFIGURATION #================================================= -ynh_script_progression --message="Removing logrotate configuration..." +ynh_script_progression --message="Removing logrotate configuration..." --weight=1 # Remove the app-specific logrotate config ynh_remove_logrotate @@ -83,7 +83,7 @@ ynh_remove_fail2ban_config #================================================= # REMOVE GPG KEY #================================================= -ynh_script_progression --message="Removing GPG key" +ynh_script_progression --message="Removing GPG key" --weight=1 gpg --batch --delete-key --yes Rainloop diff --git a/scripts/restore b/scripts/restore index beb2a80..290b2ce 100644 --- a/scripts/restore +++ b/scripts/restore @@ -76,7 +76,8 @@ ynh_system_user_create --username=$app #================================================= # Restore permissions on app files -chown -R $app: $final_path +chmod -R o-rwx $final_path +chown -R $app:www-data $final_path #================================================= # RESTORE THE PHP-FPM CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index 26e3e1e..b670943 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -31,7 +31,7 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= -ynh_script_progression --message="Ensuring downward compatibility..." +ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 # If db_name doesn't exist, create it if [ -z "$db_name" ]; then @@ -136,7 +136,7 @@ ynh_add_fpm_config #================================================= # UPDATE SSO AND PGP #================================================= -ynh_script_progression --message="Upgrading Rainloop configuration..." +ynh_script_progression --message="Upgrading Rainloop configuration..." --weight=2 # Upgrade time_offset value for fail2ban # FIXME Temporary fix for rainloop, waiting for https://github.com/YunoHost/yunohost/pull/752 to be released. @@ -168,7 +168,8 @@ ynh_use_logrotate --logfile=$final_path/app/data/_data_/_default_/logs/fail2ban/ #================================================= # Set permissions on app files -chown -R $app: $final_path +chmod -R o-rwx $final_path +chown -R $app:www-data $final_path find $final_path/. -type d -exec chmod 755 {} \; find $final_path/. -type f -exec chmod 644 {} \;