fix backup/restore

manifest.toml

@@ -53,9 +53,3 @@ ram.runtime = "50M"
 
     [resources.ports]
     main.default = 5055
-   
-    [resources.apt]
-    packages = "mariadb-server"
-
-    [resources.database]
-    type = "mysql"

scripts/backup

@@ -15,11 +15,6 @@ source /usr/share/yunohost/helpers
 #=================================================
 ynh_print_info --message="Declaring files to be backed up..."
 
-### N.B. : the following 'ynh_backup' calls are only a *declaration* of what needs
-### to be backuped and not an actual copy of any file. The actual backup that
-### creates and fill the archive with the files happens in the core after this
-### script is called. Hence ynh_backups calls takes basically 0 seconds to run.
-
 #=================================================
 # BACKUP THE APP MAIN DIR
 #=================================================
@@ -30,7 +25,6 @@ ynh_backup --src_path="$install_dir"
 # BACKUP THE DATA DIR
 #=================================================
 
-# Only relevant if there is a "data_dir" resource for this app
 ynh_backup --src_path="$data_dir" --is_big
 
 #=================================================

scripts/restore

@@ -11,25 +11,23 @@ source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
-# INSTALL DEPENDENCIES
+# STANDARD RESTORATION STEPS
 #=================================================
-ynh_script_progression --message="Installing dependencies..." --weight=5
+# RESTORE THE NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1
 
-ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
+ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-
-# Install Yarn
-ynh_npm install --global yarn
 
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
-ynh_script_progression --message="Restoring the app main directory..." --weight=1
+ynh_script_progression --message="Restoring the app main directory..." --weight=3
 
 ynh_restore_file --origin_path="$install_dir"
 
-# $install_dir will automatically be initialized with some decent 
+chmod 750 "$install_dir"
-# permission by default ... however, you may need to recursively reapply
+chmod -R o-rwx "$install_dir"
-# ownership to all files such as after the ynh_setup_source step
 chown -R $app:www-data "$install_dir"
 
 #=================================================
@@ -39,34 +37,59 @@ ynh_script_progression --message="Restoring the data directory..." --weight=1
 
 ynh_restore_file --origin_path="$data_dir" --not_mandatory
 
-# (Same as for install dir)
+mkdir -p $data_dir
+
+chmod 750 "$data_dir"
+chmod -R o-rwx "$data_dir"
 chown -R $app:www-data "$data_dir"
 
+#=================================================
+# SPECIFIC RESTORATION
+#=================================================
+# REINSTALL DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Reinstalling dependencies..." --weight=10
+
+# Define and install dependencies
+ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 
 #=================================================
-# RESTORE SYSTEM CONFIGURATIONS
+# RESTORE SYSTEMD
 #=================================================
-
+ynh_script_progression --message="Restoring the systemd configuration..." --weight=1
-ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1
-
-ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
 ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
 systemctl enable $app.service --quiet
 
+#=================================================
+# RESTORE THE LOGROTATE CONFIGURATION
+#=================================================
+ynh_script_progression --message="Restoring the logrotate configuration..." --weight=1
+
+mkdir -p "/var/log/$app"
+chown -R $app: "/var/log/$app"
 ynh_restore_file --origin_path="/etc/logrotate.d/$app"
 
-yunohost service add $app --log="/var/log/$app/$app.log"
+#=================================================
+# INTEGRATE SERVICE IN YUNOHOST
+#=================================================
+ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
+
+yunohost service add $app --description="Audiobook server" --log="/var/log/$app/$app.log"
+
+#=================================================
+# START SYSTEMD SERVICE
+#=================================================
+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" --line_match="Listening on"
 
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
-# RELOAD NGINX AND PHP-FPM OR THE APP SERVICE
+# RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1
+ynh_script_progression --message="Reloading NGINX web server..." --weight=1
-
-# Typically you only have either $app or php-fpm but not both at the same time...
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
 
 ynh_systemd_action --service_name=nginx --action=reload