Merge pull request #91 from Lab-8916100448256/testing

feat(yunohost extension): complete upgrade,  backup, restore and remo…

scripts/backup

@@ -33,6 +33,18 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
 ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
+#=================================================
+# BACKUP THE IMPORTER PLUGIN SUDOERS FILE
+#=================================================
+
+ynh_backup --src_path="/etc/sudoers.d/$app"
+
+#=================================================
+# BACKUP THE IMPORTER PLUGIN POST APP INSTALL HOOK
+#=================================================
+
+ynh_backup --src_path="/etc/yunohost/hooks.d/post_app_install/$app_sync_app_importer.sh"
+
 #=================================================
 # BACKUP THE MYSQL DATABASE
 #=================================================

scripts/install

@@ -77,7 +77,7 @@ ynh_replace_string --match_string="'allow_raw_html' => false," --replace_string=
 #=================================================
 ynh_script_progression --message="Configure importer plugin" --weight=1
 
-# Download yeswiki plugin from yeswiki repository
+# Download importer plugin from yeswiki repository
 mkdir -p "$install_dir/tools/importer"
 ynh_setup_source --dest_dir="$install_dir/tools/importer" --source_id="importerplugin"
 
@@ -99,6 +99,8 @@ chmod +x $install_dir/tools/yunohost/private/scripts/*.sh
 # Add app user in sudoers to authorize to launch yunohost cli commands without password
 ynh_add_config --template="sudoers" --destination="/etc/sudoers.d/$app"
 chown root:root /etc/sudoers.d/$app
+
+# Add a post app install hook to sync the app importer
 ynh_add_config --template="sync_app_importer.sh" --destination="/etc/yunohost/hooks.d/post_app_install/$app_sync_app_importer.sh"
 chown root:root /etc/yunohost/hooks.d/post_app_install/$app_sync_app_importer.sh
 chmod +x /etc/yunohost/hooks.d/post_app_install/$app_sync_app_importer.sh

scripts/remove

@@ -20,7 +20,11 @@ ynh_remove_nginx_config
 # Remove the dedicated PHP-FPM config
 ynh_remove_fpm_config
 
-# TODO: remove /etc/sudoers/$app
+# Remove sudoers file
+ynh_secure_remove --file="/etc/sudoers/$app"
+
+# Remove post app install hook
+ynh_secure_remove --file="/etc/yunohost/hooks.d/post_app_install/$app_sync_app_importer.sh"
 
 #=================================================
 # END OF SCRIPT

scripts/restore

@@ -35,6 +35,20 @@ ynh_script_progression --message="Restoring the NGINX web server configuration..
 
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
+#=================================================
+# RESTORE THE IMPORTER PLUGIN SUDOERS FILE
+#=================================================
+ynh_script_progression --message="Restoring the app importer plugin sudoers file..."
+
+ynh_restore_file --origin_path="/etc/sudoers.d/$app"
+
+#=================================================
+# RESTORE THE IMPORTER PLUGIN POST APP INSTALL HOOK
+#=================================================
+ynh_script_progression --message="Restoring the app importer post app install hook..."
+
+ynh_restore_file --origin_path="/etc/yunohost/hooks.d/post_app_install/$app_sync_app_importer.sh"
+
 #=================================================
 # RESTORE THE MYSQL DATABASE
 #=================================================

scripts/upgrade

@@ -73,6 +73,29 @@ ynh_secure_remove "$install_dir/tools/importer"
 mkdir -p "$install_dir/tools/importer"
 ynh_setup_source --dest_dir="$install_dir/tools/importer" --source_id="importerplugin"
 
+# Ensure that scripts are executable
+chmod +x $install_dir/tools/yunohost/private/scripts/*.sh
+
+# Add app user in sudoers to authorize to launch yunohost cli commands without password
+ynh_add_config --template="sudoers" --destination="/etc/sudoers.d/$app"
+chown root:root /etc/sudoers.d/$app
+
+# Add a post app install hook to sync the app importer
+ynh_add_config --template="sync_app_importer.sh" --destination="/etc/yunohost/hooks.d/post_app_install/$app_sync_app_importer.sh"
+chown root:root /etc/yunohost/hooks.d/post_app_install/$app_sync_app_importer.sh
+chmod +x /etc/yunohost/hooks.d/post_app_install/$app_sync_app_importer.sh
+
+# ToDo : Add importer config in wakka.config.php if it is not already there ?
+# if [ ??? ]; then
+#   ynh_replace_string --match_string=");" --replace_string="  'dataSources' => [\n'yunohost-cli' => [\n'formId' => '5', // form id used in local bazar\n'lang' >
+# fi
+
+# At last, run the YunoHost app importer
+ynh_script_progression --message="Import YunoHost apps in bazar" --weight=2
+pushd $install_dir
+ynh_exec_as $app ./yeswicli importer:sync -s yunohost-cli
+popd
+
 #=================================================
 # SECURE FILES AND DIRECTORIES
 #=================================================