From 8bbb4c984fd461c377525d85841599f79d77e4b0 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 18 Oct 2022 23:13:01 +0200 Subject: [PATCH 1/3] Update manifest.json --- manifest.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.json b/manifest.json index 24b78d0..fa6a809 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "processwire", "packaging_format": 1, "description": { - "en": "Friendly and powerful open source CMS with a strong API.", - "fr": "Friendly and powerful open source CMS with a strong API." + "en": "Friendly and powerful open source CMS with a strong API", + "fr": "CMS open source convivial et puissant avec une API puissante" }, "version": "3.0.200~ynh1", "url": "https://processwire.com/", @@ -17,8 +17,8 @@ }, "license": "MPL", "maintainer": { - "name": "John doe", - "email": "john.doe@example.com" + "name": "", + "email": "" }, "requirements": { "yunohost": ">= 11.0.9" From 07413801459718e4c0400fcd4efc669efa32456b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 18 Oct 2022 23:26:12 +0200 Subject: [PATCH 2/3] Fix --- manifest.json | 10 +++------- scripts/install | 8 ++++---- scripts/remove | 4 ++-- scripts/restore | 4 ++-- scripts/upgrade | 2 +- 5 files changed, 12 insertions(+), 16 deletions(-) diff --git a/manifest.json b/manifest.json index fa6a809..dfa01c2 100644 --- a/manifest.json +++ b/manifest.json @@ -9,13 +9,13 @@ "version": "3.0.200~ynh1", "url": "https://processwire.com/", "upstream": { - "license": "MPL", + "license": "MPL-2.0", "website": "https://processwire.com/", "userdoc": "https://processwire.com/docs/", "demo": "https://processwire.com/about/demo/", "code": "https://github.com/processwire/processwire" }, - "license": "MPL", + "license": "MPL-2.0", "maintainer": { "name": "", "email": "" @@ -52,11 +52,7 @@ }, { "name": "password", - "type": "password", - "help": { - "en": "Use the help field to add an information for the admin about this question.", - "fr": "Utilisez le champ aide pour ajouter une information à l'intention de l'administrateur à propos de cette question." - } + "type": "password" } ] } diff --git a/scripts/install b/scripts/install index 823a3e9..fd0958e 100755 --- a/scripts/install +++ b/scripts/install @@ -66,7 +66,7 @@ ynh_app_setting_set --app=$app --key=port --value=$port #================================================= # INSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Installing dependencies..." --weight=1 +ynh_script_progression --message="Installing dependencies..." --weight=9 ynh_install_app_dependencies $pkg_dependencies @@ -91,7 +91,7 @@ ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Setting up source files..." --weight=1 +ynh_script_progression --message="Setting up source files..." --weight=3 ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src @@ -104,7 +104,7 @@ chown -R $app:www-data "$final_path" #================================================= # PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 +ynh_script_progression --message="Configuring PHP-FPM..." --weight=3 # Create a dedicated PHP-FPM config ynh_add_fpm_config @@ -112,7 +112,7 @@ ynh_add_fpm_config #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=1 +ynh_script_progression --message="Configuring NGINX web server..." --weight=2 # Create a dedicated NGINX config ynh_add_nginx_config diff --git a/scripts/remove b/scripts/remove index 36f0ade..78411dc 100755 --- a/scripts/remove +++ b/scripts/remove @@ -49,7 +49,7 @@ ynh_remove_nginx_config #================================================= # REMOVE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=1 +ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=2 # Remove the dedicated PHP-FPM config ynh_remove_fpm_config @@ -57,7 +57,7 @@ ynh_remove_fpm_config #================================================= # REMOVE DEPENDENCIES #================================================= -ynh_script_progression --message="Removing dependencies..." --weight=1 +ynh_script_progression --message="Removing dependencies..." --weight=4 # Remove metapackage and its dependencies ynh_remove_app_dependencies diff --git a/scripts/restore b/scripts/restore index 6ef3ed2..b798e03 100755 --- a/scripts/restore +++ b/scripts/restore @@ -77,14 +77,14 @@ ynh_install_app_dependencies $pkg_dependencies #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the PHP-FPM configuration..." --time --weight=1 +ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=1 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the NGINX web server configuration..." --time --weight=1 +ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" diff --git a/scripts/upgrade b/scripts/upgrade index 69c6e21..d2a5540 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -125,7 +125,7 @@ ynh_add_fpm_config #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --time --weight=1 +ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 # Create a dedicated NGINX config ynh_add_nginx_config From de71addd2c52fd5cbe10865e89306fcebe7bcc7b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 19 Oct 2022 08:20:47 +0200 Subject: [PATCH 3/3] Update backup --- scripts/backup | 44 -------------------------------------------- 1 file changed, 44 deletions(-) diff --git a/scripts/backup b/scripts/backup index f99225d..4547eef 100755 --- a/scripts/backup +++ b/scripts/backup @@ -32,30 +32,18 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) domain=$(ynh_app_setting_get --app=$app --key=domain) db_name=$(ynh_app_setting_get --app=$app --key=db_name) phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) -datadir=$(ynh_app_setting_get --app=$app --key=datadir) #================================================= # DECLARE DATA AND CONF FILES TO BACKUP #================================================= 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 #================================================= ynh_backup --src_path="$final_path" -#================================================= -# BACKUP THE DATA DIR -#================================================= - -ynh_backup --src_path="$datadir" --is_big - #================================================= # BACKUP THE NGINX CONFIGURATION #================================================= @@ -68,43 +56,11 @@ 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 FAIL2BAN CONFIGURATION -#================================================= - -ynh_backup --src_path="/etc/fail2ban/jail.d/$app.conf" -ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf" - -#================================================= -# SPECIFIC BACKUP -#================================================= -# BACKUP LOGROTATE -#================================================= - -ynh_backup --src_path="/etc/logrotate.d/$app" - -#================================================= -# BACKUP SYSTEMD -#================================================= - -ynh_backup --src_path="/etc/systemd/system/$app.service" - -#================================================= -# BACKUP VARIOUS FILES -#================================================= - -ynh_backup --src_path="/etc/cron.d/$app" - -ynh_backup --src_path="/etc/$app/" - #================================================= # BACKUP THE MYSQL DATABASE #================================================= ynh_print_info --message="Backing up the MySQL database..." -### (However, things like MySQL dumps *do* take some time to run, though the -### copy of the generated dump to the archive still happens later) - ynh_mysql_dump_db --database="$db_name" > db.sql #=================================================