From 5770b66d6e85c75f99d3ed286a5fdc8f622d3db4 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 15 Mar 2021 00:22:45 +0100 Subject: [PATCH 01/13] [autopatch] Missing ynh_abort_if_errors in change_url scripts --- scripts/change_url | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/change_url b/scripts/change_url index e95f658..9413e4d 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -8,6 +8,7 @@ source _common.sh source /usr/share/yunohost/helpers +ynh_abort_if_errors #================================================= # RETRIEVE ARGUMENTS From d24ca4f0ebc5292a832af0cd5fc61205271f175d Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 15 Mar 2021 00:27:35 +0100 Subject: [PATCH 02/13] [autopatch] Autopatch to migrate to new permission system --- scripts/install | 13 +++++++------ scripts/upgrade | 10 ++++++++++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index 3d07478..4c32eac 100644 --- a/scripts/install +++ b/scripts/install @@ -53,7 +53,6 @@ ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=admin --value=$admin ynh_app_setting_set --app=$app --key=password --value=$password -ynh_app_setting_set --app=$app --key=is_public --value=$is_public ynh_app_setting_set --app=$app --key=users_status --value=$users_status #================================================= @@ -110,7 +109,7 @@ mkdir -p $final_path/plugins/auto chown -R $app: $final_path # Set the app as temporarily public for curl call -ynh_app_setting_set --app=$app --key=skipped_uris --value="/" + # Reload SSOwat config yunohost app ssowatconf @@ -145,7 +144,7 @@ email=$(yunohost user info $admin | grep mail: | cut -d' ' -f2 | tr -d '\n') ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=3b" "adresse_db=localhost" "login_db=$db_name" "pass_db=$db_pwd" "server_db=mysql" "sel_db=$db_name" "nom=$admin" "email=$email" "login=$admin" "pass=$password" "pass_verif=$password" ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=fin" -ynh_app_setting_delete --app=$app --key=skipped_uris + #================================================= # MODIFY A CONFIG FILE @@ -171,10 +170,12 @@ ynh_store_file_checksum --file="$final_path/config/connect.php" #================================================= ynh_script_progression --message="Configuring SSOwat..." + + # Make app public if necessary -if [ $is_public -eq 1 ]; then - # unprotected_uris allows SSO credentials to be passed anyway. - ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" +if [ "$is_public" -eq 1 ] +then + ynh_permission_update --permission="main" --add="visitors" fi #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 0f2af86..d55d165 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -90,6 +90,16 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors +#================================================= +# Migrate legacy permissions to new system +#================================================= +if ynh_legacy_permissions_exists +then + ynh_legacy_permissions_delete_all + + ynh_app_setting_delete --app=$app --key=is_public +fi + #================================================= # HANDLE MIGRATION FROM SPIP2 #================================================= From 1ac94680ff84d24637b734fb5f15e93b2ab339b2 Mon Sep 17 00:00:00 2001 From: chankalan Date: Tue, 30 Mar 2021 16:25:50 +0200 Subject: [PATCH 03/13] spip 3.2.11 --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index b941317..3e3f997 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ SPIP is a publishing system for the Internet in which great importance is attach Source: [spip.net](http://www.spip.net/en_rubrique25.html) -**Shipped version:** 3.2.9 +**Shipped version:** 3.2.11 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 109d7f1..4bd6e0a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -14,7 +14,7 @@ SPIP est un système de publication pour l’Internet qui s’attache particuli Source: [spip.net](http://www.spip.net/fr_rubrique91.html) -**Version incluse:** 3.2.9 +**Version incluse:** 3.2.11 ## Captures d'écran diff --git a/conf/app.src b/conf/app.src index 4f04655..92d4cad 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://files.spip.net/spip/archives/spip-v3.2.9.zip -SOURCE_SUM=1a238e8674a4921db71c89ddaac35f82ff0d532f89ad2feef321ea6b9f8cc759 +SOURCE_URL=https://files.spip.net/spip/archives/spip-v3.2.11.zip +SOURCE_SUM=6b713ec10d9ceff367ec7f76f32d9438b76919f493cae3ef3a3db0cfce570df3 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index 78167c8..5d10325 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "CMS with a focus on collaborative edition and multilingualism", "fr": "CMS conçu pour l'édition collaborative et le multilinguisme" }, - "version": "3.2.9~ynh2", + "version": "3.2.11~ynh2", "url": "http://www.spip.net/", "license": "GPL-3.0-or-later", "maintainer": { From 8c11e64ff2a9d40d372858f1c1f60dac17704955 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Thu, 13 May 2021 17:52:50 +0200 Subject: [PATCH 04/13] [autopatch] Update issue and PR templates --- .github/ISSUE_TEMPLATE.md | 55 ++++++++++++++++++++++++++++++++ .github/PULL_REQUEST_TEMPLATE.md | 16 ++++++++++ 2 files changed, 71 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE.md create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 0000000..2729a6b --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,55 @@ +--- +name: Bug report +about: When creating a bug report, please use the following template to provide all the relevant information and help debugging efficiently. + +--- + +**How to post a meaningful bug report** +1. *Read this whole template first.* +2. *Determine if you are on the right place:* + - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* + - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.* + - *When in doubt, post here and we will figure it out together.* +3. *Delete the italic comments as you write over them below, and remove this guide.* +--- + +### Describe the bug + +*A clear and concise description of what the bug is.* + +### Context + +- Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...* +- YunoHost version: x.x.x +- I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...* +- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes* + - If yes, please explain: +- Using, or trying to install package version/branch: +- If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`* + +### Steps to reproduce + +- *If you performed a command from the CLI, the command itself is enough. For example:* + ```sh + sudo yunohost app install the_app + ``` +- *If you used the webadmin, please perform the equivalent command from the CLI first.* +- *If the error occurs in your browser, explain what you did:* + 1. *Go to '...'* + 2. *Click on '...'* + 3. *Scroll down to '...'* + 4. *See error* + +### Expected behavior + +*A clear and concise description of what you expected to happen. You can remove this section if the command above is enough to understand your intent.* + +### Logs + +*When an operation fails, YunoHost provides a simple way to share the logs.* +- *In the webadmin, the error message contains a link to the relevant log page. On that page, you will be able to 'Share with Yunopaste'. If you missed it, the logs of previous operations are also available under Tools > Logs.* +- *In command line, the command to share the logs is displayed at the end of the operation and looks like `yunohost log display [log name] --share`. If you missed it, you can find the log ID of a previous operation using `yunohost log list`.* + +*After sharing the log, please copypaste directly the link provided by YunoHost (to help readability, no need to copypaste the entire content of the log here, just the link is enough...)* + +*If applicable and useful, add screenshots to help explain your problem.* diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..ef70e18 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,16 @@ +## Problem + +- *Description of why you made this PR* + +## Solution + +- *And how do you fix that problem* + +## PR Status + +- [ ] Code finished and ready to be reviewed/tested +- [ ] The fix/enhancement were manually tested (if applicable) + +## Automatic tests + +Automatic tests can be triggered on https://ci-apps-dev.yunohost.org/ *after creating the PR*, by commenting "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!". (N.B. : for this to work you need to be a member of the Yunohost-Apps organization) From c1f5c15f84fcb8d343d34ae65eb5abfda46772df Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 17 May 2021 21:19:35 +0200 Subject: [PATCH 05/13] From a more recent commit where backup script doesn't ask for `root_pwd=$(sudo cat /etc/yunohost/mysql)` --- check_process | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/check_process b/check_process index ace3266..7444c13 100644 --- a/check_process +++ b/check_process @@ -14,12 +14,11 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=2016c3a3a972dc74d1ae1ec74ff80987eb753ce9 + upgrade=1 from_commit=e079b0d81e698c9cde7e9ce50b29da1d5715bf65 backup_restore=1 multi_instance=1 port_already_use=0 change_url=1 ;;; Upgrade options - ; commit=2016c3a3a972dc74d1ae1ec74ff80987eb753ce9 - name=21 Nov 2017 - manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr_FR&is_public="Yes"&ldap=No + ; commit=e079b0d81e698c9cde7e9ce50b29da1d5715bf65 + name=3.2.4~ynh1 From 2a40cf10bf3dba19d2bd31744637892786cf3fe0 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 18 May 2021 04:02:21 +0200 Subject: [PATCH 06/13] Apply example_ynh --- manifest.json | 33 +++----------- scripts/backup | 4 +- scripts/change_url | 31 ++++++++----- scripts/install | 55 ++++++++++++----------- scripts/remove | 10 ++--- scripts/restore | 41 +++++++++-------- scripts/upgrade | 108 +++++++++++++++++++++++++-------------------- 7 files changed, 139 insertions(+), 143 deletions(-) diff --git a/manifest.json b/manifest.json index 5d10325..a76854c 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "cyp@rouquin.me" }, "requirements": { - "yunohost": ">= 3.8.1" + "yunohost": ">= 4.1.0" }, "multi_instance": true, "services": [ @@ -23,49 +23,30 @@ ], "arguments": { "install" : [ - { - "name": "domain", - "type": "domain", - "ask": { - "en": "Choose a domain name for SPIP", - "fr": "Choisissez un nom de domaine pour SPIP" - }, - "example": "example.org" - }, + { + "name": "domain", + "type": "domain", + "example": "example.com" + }, { "name": "path", "type": "path", - "ask": { - "en": "Choose a path for SPIP", - "fr": "Choisissez un chemin pour SPIP" - }, "example": "/spip", "default": "/spip" }, { "name": "admin", "type": "user", - "ask": { - "en": "Choose the SPIP administrator (must be an existing YunoHost user)", - "fr": "Administrateur du site (doit être un utilisateur YunoHost existant)" - }, "example": "johndoe" }, { "name": "password", "type": "password", - "ask": { - "en": "Choose the SPIP password for the administrator", - "fr": "Choisissez un mot de passe pour l'administrateur" - } + "example": "Choose a password" }, { "name": "is_public", "type": "boolean", - "ask": { - "en": "Is it a public SPIP site?", - "fr": "Est-ce un site public ?" - }, "default": true }, { diff --git a/scripts/backup b/scripts/backup index d564f61..86cad22 100644 --- a/scripts/backup +++ b/scripts/backup @@ -6,7 +6,7 @@ # IMPORT GENERIC HELPERS #================================================= -#Keep this path for calling _common.sh inside the execution's context of backup and restore scripts +# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers @@ -15,7 +15,6 @@ source /usr/share/yunohost/helpers #================================================= ynh_clean_setup () { - ### Remove this function if there's nothing to clean before calling the remove script. true } # Exit if an error occurs during the execution of the script @@ -59,6 +58,7 @@ ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" #================================================= # BACKUP THE MYSQL DATABASE #================================================= +ynh_print_info --message="Backing up the MySQL database..." ynh_mysql_dump_db --database="$db_name" > db.sql diff --git a/scripts/change_url b/scripts/change_url index 9413e4d..7b8d1cb 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -8,7 +8,6 @@ source _common.sh source /usr/share/yunohost/helpers -ynh_abort_if_errors #================================================= # RETRIEVE ARGUMENTS @@ -28,16 +27,24 @@ app=$YNH_APP_INSTANCE_NAME ynh_script_progression --message="Loading installation settings..." # Needed for helper "ynh_add_nginx_config" -final_path=$(ynh_app_setting_get $app final_path) +final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= -# CHECK THE SYNTAX OF THE PATHS +# BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP #================================================= +ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." -test -n "$old_path" || old_path="/" -test -n "$new_path" || new_path="/" -new_path=$(ynh_normalize_url_path $new_path) -old_path=$(ynh_normalize_url_path $old_path) +# 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 #================================================= # CHECK WHICH PARTS SHOULD BE CHANGED @@ -64,19 +71,19 @@ ynh_script_progression --message="Updating NGINX web server configuration..." nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf -# Change the path in the nginx config file +# Change the path in the NGINX config file if [ $change_path -eq 1 ] then - # Make a backup of the original nginx config file if modified + # Make a backup of the original NGINX config file if modified ynh_backup_if_checksum_is_different --file="$nginx_conf_path" - # Set global variables for nginx helper + # Set global variables for NGINX helper domain="$old_domain" path_url="$new_path" - # Create a dedicated nginx config + # Create a dedicated NGINX config ynh_add_nginx_config fi -# Change the domain for nginx +# Change the domain for NGINX if [ $change_domain -eq 1 ] then # Delete file checksum for the old conf file location diff --git a/scripts/install b/scripts/install index 4c32eac..e699a88 100644 --- a/scripts/install +++ b/scripts/install @@ -14,7 +14,6 @@ source /usr/share/yunohost/helpers #================================================= ynh_clean_setup() { - ### Remove this function if there's nothing to clean before calling the remove script. true } # Exit if an error occurs during the execution of the script @@ -27,8 +26,8 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH admin=$YNH_APP_ARG_ADMIN -password=$YNH_APP_ARG_PASSWORD is_public=$YNH_APP_ARG_IS_PUBLIC +password=$YNH_APP_ARG_PASSWORD users_status=$YNH_APP_ARG_USERS_STATUS app=$YNH_APP_INSTANCE_NAME @@ -55,14 +54,23 @@ ynh_app_setting_set --app=$app --key=admin --value=$admin ynh_app_setting_set --app=$app --key=password --value=$password ynh_app_setting_set --app=$app --key=users_status --value=$users_status +#================================================= +# CREATE DEDICATED USER +#================================================= +ynh_script_progression --message="Configuring system user..." + +# Create a system user +ynh_system_user_create --home_dir=$final_path + #================================================= # CREATE A MYSQL DATABASE #================================================= ynh_script_progression --message="Creating a MySQL database..." db_name=$(ynh_sanitize_dbid --db_name=$app) +db_user=$db_name ynh_app_setting_set --app=$app --key=db_name --value=$db_name -ynh_mysql_setup_db --db_user=$db_name --db_name=$db_name +ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) #================================================= @@ -74,22 +82,18 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:www-data "$final_path" + #================================================= # NGINX CONFIGURATION #================================================= ynh_script_progression --message="Configuring NGINX web server..." -# Create a dedicated nginx config +# Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# CREATE DEDICATED USER -#================================================= -ynh_script_progression --message="Configuring system user..." - -# Create a system user -ynh_system_user_create --username=$app - #================================================= # PHP-FPM CONFIGURATION #================================================= @@ -103,18 +107,16 @@ ynh_add_fpm_config --package="$extra_php_dependencies" #================================================= # SETUP APPLICATION WITH CURL #================================================= +ynh_script_progression --message="Setuping application with CURL..." # Set right permissions for curl install mkdir -p $final_path/plugins/auto -chown -R $app: $final_path +chown -R $app:www-data "$final_path" # Set the app as temporarily public for curl call - -# Reload SSOwat config -yunohost app ssowatconf - -# Reload Nginx -ynh_systemd_action --service_name=nginx --action=reload +ynh_script_progression --message="Configuring SSOwat..." +# Making the app public for curl +ynh_permission_update --permission="main" --add="visitors" ynh_script_progression --message="Finalizing installation..." ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=chmod" @@ -144,7 +146,8 @@ email=$(yunohost user info $admin | grep mail: | cut -d' ' -f2 | tr -d '\n') ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=3b" "adresse_db=localhost" "login_db=$db_name" "pass_db=$db_pwd" "server_db=mysql" "sel_db=$db_name" "nom=$admin" "email=$email" "login=$admin" "pass=$password" "pass_verif=$password" ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=fin" - +# Remove the public access +ynh_permission_update --permission="main" --remove="visitors" #================================================= # MODIFY A CONFIG FILE @@ -161,20 +164,16 @@ ynh_store_file_checksum --file="$final_path/config/connect.php" #================================================= # GENERIC FINALIZATION -#================================================= -# ADVERTISE SERVICE IN ADMIN PANEL -#================================================= - #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring SSOwat..." - - +ynh_script_progression --message="Configuring permissions..." # Make app public if necessary -if [ "$is_public" -eq 1 ] +if [ $is_public -eq 1 ] then + # Everyone can access the app. + # The "main" permission is automatically created before the install script. ynh_permission_update --permission="main" --add="visitors" fi diff --git a/scripts/remove b/scripts/remove index 62ea710..ed976e5 100644 --- a/scripts/remove +++ b/scripts/remove @@ -26,7 +26,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= # STOP AND REMOVE SERVICE #================================================= -ynh_script_progression --message="Stopping and removing the systemd service" +ynh_script_progression --message="Stopping and removing the systemd service..." # Remove the dedicated systemd config ynh_remove_systemd_config @@ -34,10 +34,10 @@ ynh_remove_systemd_config #================================================= # REMOVE THE MYSQL DATABASE #================================================= -ynh_script_progression --message="Stopping and removing the systemd service" +ynh_script_progression --message="Removing the MySQL database..." # Remove a database if it exists, along with the associated user -ynh_mysql_remove_db --db_user=$db_name --db_name=$db_name +ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name #================================================= # REMOVE APP MAIN DIR @@ -52,7 +52,7 @@ ynh_secure_remove --file="$final_path" #================================================= ynh_script_progression --message="Removing NGINX web server configuration..." -# Remove the dedicated nginx config +# Remove the dedicated NGINX config ynh_remove_nginx_config #================================================= @@ -60,7 +60,7 @@ ynh_remove_nginx_config #================================================= ynh_script_progression --message="Removing PHP-FPM configuration..." -# Remove the dedicated php-fpm config +# Remove the dedicated PHP-FPM config ynh_remove_fpm_config #================================================= diff --git a/scripts/restore b/scripts/restore index 08afe94..dce1c2c 100644 --- a/scripts/restore +++ b/scripts/restore @@ -6,7 +6,7 @@ # IMPORT GENERIC HELPERS #================================================= -#Keep this path for calling _common.sh inside the execution's context of backup and restore scripts +# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers @@ -15,7 +15,6 @@ source /usr/share/yunohost/helpers #================================================= ynh_clean_setup () { - #### Remove this function if there's nothing to clean before calling the remove script. true } # Exit if an error occurs during the execution of the script @@ -24,7 +23,7 @@ ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading settings..." +ynh_script_progression --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME @@ -32,6 +31,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) +db_user=$db_name phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= @@ -49,9 +49,18 @@ test ! -d $final_path \ #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= +ynh_script_progression --message="Restoring the NGINX configuration..." ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" +#================================================= +# RECREATE THE DEDICATED USER +#================================================= +ynh_script_progression --message="Recreating the dedicated system user..." + +# Create the dedicated user (if not existing) +ynh_system_user_create --username=$app --home_dir=$final_path + #================================================= # RESTORE THE APP MAIN DIR #================================================= @@ -59,24 +68,14 @@ ynh_script_progression --message="Restoring the app main directory..." ynh_restore_file --origin_path="$final_path" -#================================================= -# RECREATE THE DEDICATED USER -#================================================= -ynh_script_progression --message="Recreating the dedicated system user..." - -# Create the dedicated user (if not existing) -ynh_system_user_create --username=$app - -#================================================= -# RESTORE USER RIGHTS -#================================================= - -# Restore permissions on app files -chown -R $app: $final_path +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:www-data "$final_path" #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= +ynh_script_progression --message="Restoring the PHP-FPM configuration..." # Restore the file first, so it can have a backup if different ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" @@ -93,8 +92,8 @@ ynh_add_fpm_config --phpversion=$phpversion --package="$extra_php_dependencies" ynh_script_progression --message="Restoring the MySQL database..." db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) -ynh_mysql_setup_db --db_user=$db_name --db_name=$db_name --db_pwd=$db_pwd -ynh_mysql_connect_as --user=$db_name --password=$db_pwd --database=$db_name < ./db.sql +ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd +ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql #================================================= # GENERIC FINALIZATION @@ -103,11 +102,11 @@ ynh_mysql_connect_as --user=$db_name --password=$db_pwd --database=$db_name < ./ #================================================= ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." -ynh_systemd_action --service_name=php${phpversion}-fpm --action=reload +ynh_systemd_action --service_name=php$phpversion-fpm --action=reload ynh_systemd_action --service_name=nginx --action=reload #================================================= # END OF SCRIPT #================================================= -ynh_print_info "Restoration completed for $app" +ynh_script_progression --message="Restoration completed for $app" diff --git a/scripts/upgrade b/scripts/upgrade index d55d165..3c2ba5e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -26,6 +26,34 @@ users_status=$(ynh_app_setting_get --app=$app --key=users_status) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) +#================================================= +# CHECK VERSION +#================================================= +ynh_script_progression --message="Checking version..." + +upgrade_type=$(ynh_check_app_version_changed) + +#================================================= +# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP +#================================================= +ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." + +# Backup the current version of the app +ynh_backup_before_upgrade +ynh_clean_setup () { + if [ $migration_process -eq 1 ]; then + yunohost app remove $app + # Reload some values changed by the migration process + app=$YNH_APP_INSTANCE_NAME + fi + # 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 UPGRADE STEPS #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= @@ -71,28 +99,6 @@ if [ -z $password ]; then ynh_app_setting_set --app=$app --key=password --value=$password fi -#================================================= -# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP -#================================================= -ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." - -# Backup the current version of the app -ynh_backup_before_upgrade -ynh_clean_setup () { - if [ $migration_process -eq 1 ]; then - yunohost app remove $app - # Reload some values changed by the migration process - app=$YNH_APP_INSTANCE_NAME - fi - # restore it if the upgrade fails - ynh_restore_upgradebackup -} -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - -#================================================= -# Migrate legacy permissions to new system -#================================================= if ynh_legacy_permissions_exists then ynh_legacy_permissions_delete_all @@ -113,37 +119,43 @@ if [ $migration_process -eq 1 ]; then fi #================================================= -# STANDARD UPGRADE STEPS +# CREATE DEDICATED USER +#================================================= +ynh_script_progression --message="Making sure dedicated system user exists..." + +# Create a dedicated user (if not existing) +ynh_system_user_create --username=$app --home_dir=$final_path + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Upgrading source files..." -# Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir="$final_path" +if [ "$upgrade_type" == "UPGRADE_APP" ] +then + ynh_script_progression --message="Upgrading source files..." + + # Download, check integrity, uncompress and patch the source from app.src + ynh_setup_source --dest_dir="$final_path" +fi + +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:www-data "$final_path" #================================================= # NGINX CONFIGURATION #================================================= ynh_script_progression --message="Upgrading NGINX web server configuration..." -# Create a dedicated nginx config +# Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# CREATE DEDICATED USER -#================================================= -ynh_script_progression --message="Making sure dedicated system user exists..." - -# Create a dedicated user (if not existing) -ynh_system_user_create --username=$app - #================================================= # PHP-FPM CONFIGURATION #================================================= ynh_script_progression --message="Upgrading PHP-FPM configuration..." -# Create a dedicated php-fpm config +# Create a dedicated PHP-FPM config ynh_add_fpm_config --package="$extra_php_dependencies" #================================================= @@ -157,9 +169,9 @@ mkdir -p $final_path/plugins/auto chown -R $app: $final_path # Set the app as temporarily public for curl call -ynh_app_setting_set --app=$app --key=skipped_uris --value="/" -# Reload SSOwat config -yunohost app ssowatconf +ynh_script_progression --message="Configuring SSOwat..." +# Making the app public for curl +ynh_permission_update --permission="main" --add="visitors" ynh_backup_if_checksum_is_different --file="$final_path/config/connect.php" @@ -192,19 +204,16 @@ email=$(yunohost user info $admin | grep mail: | cut -d' ' -f2 | tr -d '\n') ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=3b" "adresse_db=localhost" "login_db=$db_name" "pass_db=$db_pwd" "server_db=mysql" "sel_db=$db_name" "nom=$admin" "email=$email" "login=$admin" "pass=$password" "pass_verif=$password" ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=fin" -ynh_app_setting_delete --app=$app --key=skipped_uris +# Remove the public access +ynh_permission_update --permission="main" --remove="visitors" #================================================= -# MODIFY A CONFIG FILE +# UPDATE A CONFIG FILE #================================================= - +ynh_script_progression --message="Updating a configuration file..." #ynh_replace_string --match_string="'','utf8');" --replace_string="'ldap.php','utf8');" --target_file=$final_path/config/connect.php cp ../conf/mes_options.php $final_path/config/mes_options.php -#================================================= -# STORE THE CONFIG FILE CHECKSUM -#================================================= - ynh_store_file_checksum --file="$final_path/config/connect.php" #================================================= @@ -212,13 +221,14 @@ ynh_store_file_checksum --file="$final_path/config/connect.php" #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Upgrading SSOwat configuration..." +ynh_script_progression --message="Configuring permissions..." # Make app public if necessary if [ $is_public -eq 1 ] then - # unprotected_uris allows SSO credentials to be passed anyway - ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" + # Everyone can access the app. + # The "main" permission is automatically created before the install script. + ynh_permission_update --permission="main" --add="visitors" fi #================================================= From d98c9c4ee4b574a04645b23374ada93f68be7e55 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 18 May 2021 23:30:35 +0200 Subject: [PATCH 07/13] Fix install --- scripts/install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index e699a88..b3d8137 100644 --- a/scripts/install +++ b/scripts/install @@ -13,7 +13,7 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup() { +ynh_clean_setup () { true } # Exit if an error occurs during the execution of the script @@ -60,7 +60,7 @@ ynh_app_setting_set --app=$app --key=users_status --value=$users_status ynh_script_progression --message="Configuring system user..." # Create a system user -ynh_system_user_create --home_dir=$final_path +ynh_system_user_create --username=$app --home_dir=$final_path #================================================= # CREATE A MYSQL DATABASE @@ -99,7 +99,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Configuring PHP-FPM..." -# Create a dedicated php-fpm config +# Create a dedicated PHP-FPM config ynh_add_fpm_config --package="$extra_php_dependencies" #================================================= From 6f7a1e36f919f495dc3e125e27b38c2d35d741f4 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 19 May 2021 02:06:11 +0200 Subject: [PATCH 08/13] Update install --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index b3d8137..1816d20 100644 --- a/scripts/install +++ b/scripts/install @@ -118,6 +118,7 @@ ynh_script_progression --message="Configuring SSOwat..." # Making the app public for curl ynh_permission_update --permission="main" --add="visitors" +# Installation with curl ynh_script_progression --message="Finalizing installation..." ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=chmod" ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=2" "chmod=755" "adresse_db=localhost" "login_db=$db_name" "pass_db=$db_pwd" "server_db=mysql" From c29dac4565c1a0bfc368c98ba734eac20f57a8d7 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 19 May 2021 21:27:43 +0200 Subject: [PATCH 09/13] Fix install --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index 1816d20..40e2b4a 100644 --- a/scripts/install +++ b/scripts/install @@ -52,6 +52,7 @@ ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=admin --value=$admin ynh_app_setting_set --app=$app --key=password --value=$password +ynh_app_setting_set --app=$app --key=is_public --value=$is_public ynh_app_setting_set --app=$app --key=users_status --value=$users_status #================================================= From b2132a729151da3a74dbec0f66782e3623095924 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 19 May 2021 21:28:20 +0200 Subject: [PATCH 10/13] Fix upgrade --- scripts/upgrade | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 3c2ba5e..6e30a1e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -102,8 +102,6 @@ fi if ynh_legacy_permissions_exists then ynh_legacy_permissions_delete_all - - ynh_app_setting_delete --app=$app --key=is_public fi #================================================= From 85a1fc63ba2b0fdec4f51f3a789ef6f924e90e06 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 24 May 2021 12:31:28 +0200 Subject: [PATCH 11/13] Fix upgrade --- check_process | 1 + conf/app.src | 1 + conf/nginx.conf | 104 ++++++++++++++++++++++---------------------- manifest.json | 112 ++++++++++++++++++++++++------------------------ scripts/upgrade | 16 +++++-- 5 files changed, 122 insertions(+), 112 deletions(-) diff --git a/check_process b/check_process index 7444c13..27e69bf 100644 --- a/check_process +++ b/check_process @@ -14,6 +14,7 @@ setup_private=1 setup_public=1 upgrade=1 + #3.2.4~ynh1 upgrade=1 from_commit=e079b0d81e698c9cde7e9ce50b29da1d5715bf65 backup_restore=1 multi_instance=1 diff --git a/conf/app.src b/conf/app.src index 92d4cad..d1e302b 100644 --- a/conf/app.src +++ b/conf/app.src @@ -4,3 +4,4 @@ SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false SOURCE_FILENAME= +SOURCE_EXTRACT=true diff --git a/conf/nginx.conf b/conf/nginx.conf index 6ec2a3a..40fdb30 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,65 +1,65 @@ #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { - # Path to source - alias __FINALPATH__/ ; + # Path to source + alias __FINALPATH__/ ; - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } + # Force usage of https + if ($scheme = http) { + rewrite ^ https://$server_name$request_uri? permanent; + } - index index.php; + index index.php; - client_max_body_size 30M; + client_max_body_size 30M; - try_files $uri $uri/ index.php; + try_files $uri $uri/ index.php; - if (!-e $request_filename) - { - rewrite ^/([^/]*)/robots\.txt$ __PATH__/spip.php?page=robots.txt last; - rewrite ^/([^/]*)/sitemap\.xml$ __PATH__/spip.php?page=sitemap.xml last; - rewrite ^(.+)$ __PATH__/index.php?q=$1 last; - } + if (!-e $request_filename) + { + rewrite ^/([^/]*)/robots\.txt$ __PATH__/spip.php?page=robots.txt last; + rewrite ^/([^/]*)/sitemap\.xml$ __PATH__/spip.php?page=sitemap.xml last; + rewrite ^(.+)$ __PATH__/index.php?q=$1 last; + } - # Add headers to serve security related headers - more_set_headers 'Strict-Transport-Security: max-age=15768000'; - more_set_headers 'X-Content-Type-Options: nosniff'; - more_set_headers 'X-Frame-Options: SAMEORIGIN'; - more_set_headers 'X-XSS-Protection: 1, mode=block'; - more_set_headers 'X-Robots-Tag: none'; - more_set_headers 'X-Download-Options: noopen'; - more_set_headers 'X-Permitted-Cross-Domain-Policies: none'; + # Add headers to serve security related headers + more_set_headers 'Strict-Transport-Security: max-age=15768000'; + more_set_headers 'X-Content-Type-Options: nosniff'; + more_set_headers 'X-Frame-Options: SAMEORIGIN'; + more_set_headers 'X-XSS-Protection: 1, mode=block'; + more_set_headers 'X-Robots-Tag: none'; + more_set_headers 'X-Download-Options: noopen'; + more_set_headers 'X-Permitted-Cross-Domain-Policies: none'; - location ~^/(tmp|config|\.ht)/{ - deny all; - } - location ~* \.(jpg|jpeg|gif|css|png|js|ico|swf|mp3|pdf)$ { - # Le contenu statique, est signalé au navigateur comme étant - # à garder en cache une semaine. Si il y a un proxy sur la - # route, celui-ci est autorisé à faire une copie et à la - # cacher. - rewrite ^/([^/]*)/favicon\.ico$ __PATH__/spip.php?page=favicon.ico last; - expires 1w; - more_set_headers 'Cache-Control: public'; - } - - location ~ [^/]\.php(/|$) { - fastcgi_split_path_info ^(.+?\.php)(/.*)$; - fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; + location ~^/(tmp|config|\.ht)/{ + deny all; + } + location ~* \.(jpg|jpeg|gif|css|png|js|ico|swf|mp3|pdf)$ { + # Le contenu statique, est signalé au navigateur comme étant + # à garder en cache une semaine. Si il y a un proxy sur la + # route, celui-ci est autorisé à faire une copie et à la + # cacher. + rewrite ^/([^/]*)/favicon\.ico$ __PATH__/spip.php?page=favicon.ico last; + expires 1w; + more_set_headers 'Cache-Control: public'; + } + + location ~ [^/]\.php(/|$) { + fastcgi_split_path_info ^(.+?\.php)(/.*)$; + fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param REMOTE_USER $remote_user; - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param SCRIPT_FILENAME $request_filename; - - set $ecrire 0; - if ($uri ~ ^/ecrire.*) { - set $ecrire 1; - } - } + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param REMOTE_USER $remote_user; + fastcgi_param PATH_INFO $fastcgi_path_info; + fastcgi_param SCRIPT_FILENAME $request_filename; + + set $ecrire 0; + if ($uri ~ ^/ecrire.*) { + set $ecrire 1; + } + } - # Include SSOWAT user panel. - include conf.d/yunohost_panel.conf.inc; + # Include SSOWAT user panel. + include conf.d/yunohost_panel.conf.inc; } diff --git a/manifest.json b/manifest.json index a76854c..6a9a493 100644 --- a/manifest.json +++ b/manifest.json @@ -1,64 +1,64 @@ { - "name": "SPIP", - "id": "spip", - "packaging_format": 1, - "description": { - "en": "CMS with a focus on collaborative edition and multilingualism", - "fr": "CMS conçu pour l'édition collaborative et le multilinguisme" - }, - "version": "3.2.11~ynh2", - "url": "http://www.spip.net/", - "license": "GPL-3.0-or-later", - "maintainer": { - "name": "cyp", - "email": "cyp@rouquin.me" - }, - "requirements": { - "yunohost": ">= 4.1.0" - }, - "multi_instance": true, - "services": [ - "nginx", - "mysql" - ], - "arguments": { - "install" : [ + "name": "SPIP", + "id": "spip", + "packaging_format": 1, + "description": { + "en": "CMS with a focus on collaborative edition and multilingualism", + "fr": "CMS conçu pour l'édition collaborative et le multilinguisme" + }, + "version": "3.2.11~ynh2", + "url": "http://www.spip.net/", + "license": "GPL-3.0-or-later", + "maintainer": { + "name": "cyp", + "email": "cyp@rouquin.me" + }, + "requirements": { + "yunohost": ">= 4.1.0" + }, + "multi_instance": true, + "services": [ + "nginx", + "mysql" + ], + "arguments": { + "install" : [ { "name": "domain", "type": "domain", "example": "example.com" }, - { - "name": "path", - "type": "path", - "example": "/spip", - "default": "/spip" - }, - { - "name": "admin", - "type": "user", - "example": "johndoe" - }, - { - "name": "password", - "type": "password", + { + "name": "path", + "type": "path", + "example": "/spip", + "default": "/spip" + }, + { + "name": "admin", + "type": "user", + "example": "johndoe" + }, + { + "name": "password", + "type": "password", "example": "Choose a password" - }, - { - "name": "is_public", - "type": "boolean", - "default": true - }, - { - "name": "users_status", - "type": "string", - "ask": { - "en": "Choose the status of YunoHost users", - "fr": "Choisissez le status des utilisateurs de YunoHost" - }, - "choices": ["Administrator", "Editor", "Visitor"], - "default": "Editor" - } - ] - } + }, + { + "name": "is_public", + "type": "boolean", + "default": true + }, + { + "name": "users_status", + "type": "string", + "ask": { + "en": "Choose the status of YunoHost users", + "fr": "Choisissez le status des utilisateurs de YunoHost" + }, + "choices": ["Administrator", "Editor", "Visitor"], + "default": "Editor" + } + ] + } } diff --git a/scripts/upgrade b/scripts/upgrade index 6e30a1e..60c3572 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -24,6 +24,7 @@ is_public=$(ynh_app_setting_get --app=$app --key=is_public) final_path=$(ynh_app_setting_get --app=$app --key=final_path) users_status=$(ynh_app_setting_get --app=$app --key=users_status) db_name=$(ynh_app_setting_get --app=$app --key=db_name) +db_user=$db_name db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) #================================================= @@ -99,8 +100,8 @@ if [ -z $password ]; then ynh_app_setting_set --app=$app --key=password --value=$password fi -if ynh_legacy_permissions_exists -then +# Cleaning legacy permissions +if ynh_legacy_permissions_exists; then ynh_legacy_permissions_delete_all fi @@ -161,10 +162,11 @@ ynh_add_fpm_config --package="$extra_php_dependencies" #================================================= # SETUP APPLICATION WITH CURL #================================================= +ynh_script_progression --message="Setuping application with CURL..." # Set right permissions for curl install mkdir -p $final_path/plugins/auto -chown -R $app: $final_path +chown -R $app:www-data "$final_path" # Set the app as temporarily public for curl call ynh_script_progression --message="Configuring SSOwat..." @@ -175,6 +177,8 @@ ynh_backup_if_checksum_is_different --file="$final_path/config/connect.php" ynh_secure_remove --file="$final_path/config/connect.php" +# Installation with curl +ynh_script_progression --message="Finalizing installation..." ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=chmod" ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=2" "chmod=755" "adresse_db=localhost" "login_db=$db_name" "pass_db=$db_pwd" "server_db=mysql" ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=3" "adresse_db=localhost" "login_db=$db_name" "pass_db=$db_pwd" "server_db=mysql" "choix_db=$db_name" "tprefix=$db_name" @@ -208,10 +212,14 @@ ynh_permission_update --permission="main" --remove="visitors" #================================================= # UPDATE A CONFIG FILE #================================================= -ynh_script_progression --message="Updating a configuration file..." + #ynh_replace_string --match_string="'','utf8');" --replace_string="'ldap.php','utf8');" --target_file=$final_path/config/connect.php cp ../conf/mes_options.php $final_path/config/mes_options.php +#================================================= +# STORE THE CONFIG FILE CHECKSUM +#================================================= + ynh_store_file_checksum --file="$final_path/config/connect.php" #================================================= From 89dd288c9782ca6c4705a78f1200dd5c9bcaa608 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 28 May 2021 00:48:27 +0200 Subject: [PATCH 12/13] Update check_process --- check_process | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/check_process b/check_process index 27e69bf..0997db4 100644 --- a/check_process +++ b/check_process @@ -14,8 +14,20 @@ setup_private=1 setup_public=1 upgrade=1 - #3.2.4~ynh1 + # 3.2.4~ynh1 upgrade=1 from_commit=e079b0d81e698c9cde7e9ce50b29da1d5715bf65 + # 3.2.5~ynh1 + upgrade=1 from_commit=bf4e4ecbed70de828d0a0828f3240febb25dde0e + # 3.2.7~ynh2 + upgrade=1 from_commit=a13cdbc22324173e983cf8c358920615d8c10e64 + # 3.2.7~ynh3 + upgrade=1 from_commit=69521e339ffc50e4960968b63d2aee8ffe81f854 + # 3.2.8~ynh1 + upgrade=1 from_commit=810fd850466139fe4b7ee31eabc13d81d4020698 + # 3.2.8~ynh2 + upgrade=1 from_commit=0d7e9e61e95d2ad6e1443566d2c45325730fd29b + # 3.2.9~ynh2 + upgrade=1 from_commit=7cb55ab7365af2c52b3c709127da860b87f932fc backup_restore=1 multi_instance=1 port_already_use=0 @@ -23,3 +35,15 @@ ;;; Upgrade options ; commit=e079b0d81e698c9cde7e9ce50b29da1d5715bf65 name=3.2.4~ynh1 + ; commit=bf4e4ecbed70de828d0a0828f3240febb25dde0e + name=3.2.5~ynh1 + ; commit=a13cdbc22324173e983cf8c358920615d8c10e64 + name=3.2.7~ynh2 + ; commit=69521e339ffc50e4960968b63d2aee8ffe81f854 + name=3.2.7~ynh3 + ; commit=810fd850466139fe4b7ee31eabc13d81d4020698 + name=3.2.8~ynh1 + ; commit=0d7e9e61e95d2ad6e1443566d2c45325730fd29b + name=3.2.8~ynh2 + ; commit=7cb55ab7365af2c52b3c709127da860b87f932fc + name=3.2.9~ynh2 \ No newline at end of file From a90e80de4a5fbd5ef718c1271e5085f7129ced6c Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 15 Jun 2021 23:10:38 +0200 Subject: [PATCH 13/13] remove oldest test upgrade --- check_process | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/check_process b/check_process index 0997db4..8caabdb 100644 --- a/check_process +++ b/check_process @@ -15,9 +15,9 @@ setup_public=1 upgrade=1 # 3.2.4~ynh1 - upgrade=1 from_commit=e079b0d81e698c9cde7e9ce50b29da1d5715bf65 + #upgrade=1 from_commit=e079b0d81e698c9cde7e9ce50b29da1d5715bf65 # 3.2.5~ynh1 - upgrade=1 from_commit=bf4e4ecbed70de828d0a0828f3240febb25dde0e + #upgrade=1 from_commit=bf4e4ecbed70de828d0a0828f3240febb25dde0e # 3.2.7~ynh2 upgrade=1 from_commit=a13cdbc22324173e983cf8c358920615d8c10e64 # 3.2.7~ynh3