Fix

scripts/change_url

@@ -1,51 +1,115 @@
 #!/bin/bash
 
 #=================================================
-# GENERIC START
+# GENERIC STARTING
+#=================================================
+# IMPORT GENERIC HELPERS
 #=================================================
 
-# IMPORT GENERIC HELPERS
+source _common.sh
 source /usr/share/yunohost/helpers
 
-# Exit if an error occurs during the execution of the script
+#=================================================
-ynh_abort_if_errors
-
-# Import common cmd
-source ./_common.sh
-
 # RETRIEVE ARGUMENTS
+#=================================================
+
 old_domain=$YNH_APP_OLD_DOMAIN
-domain=$YNH_APP_NEW_DOMAIN
+old_path=$YNH_APP_OLD_PATH
-path_url=$(ynh_normalize_url_path ${YNH_APP_NEW_PATH:-'/'})
+
+new_domain=$YNH_APP_NEW_DOMAIN
+new_path=${YNH_APP_NEW_PATH:-'/'}
+
 app=$YNH_APP_INSTANCE_NAME
 
-dbpass=$(ynh_app_setting_get "$app" mysqlpwd)
+#=================================================
-admin=$(ynh_app_setting_get "$app" adminusername)
+# LOAD SETTINGS
-key=$(ynh_app_setting_get "$app" secret_key)
+#=================================================
-port=$(ynh_app_setting_get "$app" web_port)
+ynh_script_progression --message="Loading installation settings..." --weight=1
-is_public=$(ynh_app_setting_get "$app" is_public)
+
+dbpass=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
+admin=$(ynh_app_setting_get --app=$app --key=adminusername)
+key=$(ynh_app_setting_get --app=$app --key=secret_key)
+port=$(ynh_app_setting_get --app=$app --key=web_port)
+is_public=$(ynh_app_setting_get --app=$app --key=is_public)
+
+#=================================================
+# BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP
+#=================================================
+ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1
+
+# Backup the current version of the app
+ynh_backup_before_upgrade
+ynh_clean_setup () {
+	# Remove the new domain config file, the remove script won't do it as it doesn't know yet its location.
+	ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
+
+	# Restore it if the upgrade fails
+	ynh_restore_upgradebackup
+}
+# Exit if an error occurs during the execution of the script
+ynh_abort_if_errors
 
 #=================================================
 # STANDARD MODIFICATIONS
 #=================================================
+# STOP SYSTEMD SERVICE
+#=================================================
+ynh_script_progression --message="Stopping a systemd service..." --time --weight=1
 
-# Change the domain for nginx
+ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log"
-if [ "$old_domain" != "$domain" ]
+
+#=================================================
+# MODIFY URL IN NGINX CONF
+#=================================================
+ynh_script_progression --message="Updating NGINX web server configuration..." --time --weight=1
+
+nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf
+
+# Change the path in the NGINX config file
+if [ $change_path -eq 1 ]
 then
-    # Delete file checksum for the old conf file location
+	# Make a backup of the original NGINX config file if modified
-    ynh_delete_file_checksum "/etc/nginx/conf.d/$old_domain.d/$app.conf"
+	ynh_backup_if_checksum_is_different --file="$nginx_conf_path"
-
+	# Set global variables for NGINX helper
-    mv "/etc/nginx/conf.d/$old_domain.d/$app.conf" "/etc/nginx/conf.d/$domain.d/$app.conf"
+	domain="$old_domain"
-
+	path_url="$new_path"
-    # Store file checksum for the new config file location
+	# Create a dedicated NGINX config
-    ynh_store_file_checksum "/etc/nginx/conf.d/$domain.d/$app.conf"
+	ynh_add_nginx_config
 fi
 
-config_nginx
+# Change the domain for NGINX
+if [ $change_domain -eq 1 ]
+then
+	# Delete file checksum for the old conf file location
+	ynh_delete_file_checksum --file="$nginx_conf_path"
+	mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf
+	# Store file checksum for the new config file location
+	ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
+fi
+
+#=================================================
+# SPECIFIC MODIFICATIONS
+#=================================================
 
 # Update gogs config
 config_gogs
 
-# RELOAD services
+#=================================================
-ynh_check_starting "INFO] Listen: http://0.0.0.0:" "/var/log/$app/gogs.log"
+# START SYSTEMD SERVICE
-sleep 1
+#=================================================
+ynh_script_progression --message="Starting a systemd service..." --weight=1
+
+ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
+
+#=================================================
+# RELOAD NGINX
+#=================================================
+ynh_script_progression --message="Reloading NGINX web server..." --weight=1
+
+ynh_systemd_action --service_name=nginx --action=reload
+
+#=================================================
+# END OF SCRIPT
+#=================================================
+
+ynh_script_progression --message="Change of URL completed for $app" --last

scripts/install

@@ -86,7 +86,12 @@ ynh_add_nginx_config
 #=================================================
 
 # Set permissions
-set_permission
+chown -R $app:$app "$final_path"
+chown -R $app:$app "/home/$app"
+chown -R $app:$app "/var/log/$app"
+chmod u=rwX,g=rX,o= "$final_path"
+chmod u=rwX,g=rX,o= "/home/$app"
+chmod u=rwX,g=rX,o= "/var/log/$app"
 
 # Unprotect root from SSO if public
 set_access_settings

scripts/restore

@@ -62,8 +62,9 @@ ynh_mysql_connect_as --user=$dbuser --password=$dbpass --database=$dbname < ./db
 #=================================================
 # RESTORE VARIOUS FILES
 #=================================================
-ynh_script_progression --message="Restoring various files..." --time --weight=1
+ynh_script_progression --message="Restoring various files..." --weight=1
 
+ynh_restore_file --origin_path="/var/log/$app"
 
 #=================================================
 # RESTORE SYSTEMD
@@ -78,15 +79,17 @@ systemctl enable $app.service --quiet
 #=================================================
 
 # Set permissions
-set_permission
+chown -R $app:$app "$final_path"
-
+chown -R $app:$app "/home/$app"
-# Configure logrotate
+chown -R $app:$app "/var/log/$app"
-ynh_use_logrotate "/var/log/$app"
+chmod u=rwX,g=rX,o= "$final_path"
+chmod u=rwX,g=rX,o= "/home/$app"
+chmod u=rwX,g=rX,o= "/var/log/$app"
 
 #=================================================
 # RESTORE THE LOGROTATE CONFIGURATION
 #=================================================
-ynh_script_progression --message="Restoring the logrotate configuration..." --time --weight=1
+ynh_script_progression --message="Restoring the logrotate configuration..." --weight=1
 
 ynh_restore_file --origin_path="/etc/logrotate.d/$app"
 

scripts/upgrade

@@ -129,7 +129,12 @@ ynh_add_nginx_config
 set_access_settings
 
 # Set permissions
-set_permission
+chown -R $app:$app "$final_path"
+chown -R $app:$app "/home/$app"
+chown -R $app:$app "/var/log/$app"
+chmod u=rwX,g=rX,o= "$final_path"
+chmod u=rwX,g=rX,o= "/home/$app"
+chmod u=rwX,g=rX,o= "/var/log/$app"
 
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST