Merge pull request #107 from yunohost-bot/auto-helpers-2.1

[autopatch] Automatic patch attempt for helpers 2.1

ALL_README.md

@@ -6,5 +6,6 @@
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)
 - [Baca README dalam bahasa bahasa Indonesia](README_id.md)
+- [Lees de README in het Nederlands](README_nl.md)
 - [Прочитать README на русский](README_ru.md)
 - [阅读中文（简体）的 README](README_zh_Hans.md)

README.md

@@ -19,7 +19,7 @@ It shall NOT be edited by hand.
 Gitea is a fork of Gogs a self-hosted Git service written in Go. Alternative to GitHub.
 
 
-**Shipped version:** 1.22.2~ynh1
+**Shipped version:** 1.22.3~ynh1
 
 ## Screenshots
 

README_es.md

@@ -19,7 +19,7 @@ No se debe editar a mano.
 Gitea is a fork of Gogs a self-hosted Git service written in Go. Alternative to GitHub.
 
 
-**Versión actual:** 1.22.2~ynh1
+**Versión actual:** 1.22.3~ynh1
 
 ## Capturas
 
@@ -35,7 +35,7 @@ Gitea is a fork of Gogs a self-hosted Git service written in Go. Alternative to
 
 ## Información para desarrolladores
 
-Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/gitea_ynh/tree/testing
+Por favor enviar sus correcciones a la [rama `testing`](https://github.com/YunoHost-Apps/gitea_ynh/tree/testing).
 
 Para probar la rama `testing`, sigue asÍ:
 

README_eu.md

@@ -19,7 +19,7 @@ EZ editatu eskuz.
 Gitea is a fork of Gogs a self-hosted Git service written in Go. Alternative to GitHub.
 
 
-**Paketatutako bertsioa:** 1.22.2~ynh1
+**Paketatutako bertsioa:** 1.22.3~ynh1
 
 ## Pantaila-argazkiak
 

README_fr.md

@@ -19,7 +19,7 @@ Il NE doit PAS être modifié à la main.
 Gitea is a fork of Gogs a self-hosted Git service written in Go. Alternative to GitHub.
 
 
-**Version incluse :** 1.22.2~ynh1
+**Version incluse :** 1.22.3~ynh1
 
 ## Captures d’écran
 

README_gl.md

@@ -19,7 +19,7 @@ NON debe editarse manualmente.
 Gitea is a fork of Gogs a self-hosted Git service written in Go. Alternative to GitHub.
 
 
-**Versión proporcionada:** 1.22.2~ynh1
+**Versión proporcionada:** 1.22.3~ynh1
 
 ## Capturas de pantalla
 

README_id.md

@@ -19,7 +19,7 @@ Ini TIDAK boleh diedit dengan tangan.
 Gitea is a fork of Gogs a self-hosted Git service written in Go. Alternative to GitHub.
 
 
-**Versi terkirim:** 1.22.2~ynh1
+**Versi terkirim:** 1.22.3~ynh1
 
 ## Tangkapan Layar
 

README_nl.md

@@ -0,0 +1,48 @@
+<!--
+NB: Deze README is automatisch gegenereerd door <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Hij mag NIET handmatig aangepast worden.
+-->
+
+# Gitea voor Yunohost
+
+[![Integratieniveau](https://dash.yunohost.org/integration/gitea.svg)](https://ci-apps.yunohost.org/ci/apps/gitea/) ![Mate van functioneren](https://ci-apps.yunohost.org/ci/badges/gitea.status.svg) ![Onderhoudsstatus](https://ci-apps.yunohost.org/ci/badges/gitea.maintain.svg)
+
+[![Gitea met Yunohost installeren](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=gitea)
+
+*[Deze README in een andere taal lezen.](./ALL_README.md)*
+
+> *Met dit pakket kun je Gitea snel en eenvoudig op een YunoHost-server installeren.*  
+> *Als je nog geen YunoHost hebt, lees dan [de installatiehandleiding](https://yunohost.org/install), om te zien hoe je 'm installeert.*
+
+## Overzicht
+
+Gitea is a fork of Gogs a self-hosted Git service written in Go. Alternative to GitHub.
+
+
+**Geleverde versie:** 1.22.3~ynh1
+
+## Schermafdrukken
+
+![Schermafdrukken van Gitea](./doc/screenshots/screenshot.png)
+
+## Documentatie en bronnen
+
+- Officiele website van de app: <https://gitea.io/>
+- Officiele beheerdersdocumentatie: <https://docs.gitea.io/>
+- Upstream app codedepot: <https://github.com/go-gitea/gitea>
+- YunoHost-store: <https://apps.yunohost.org/app/gitea>
+- Meld een bug: <https://github.com/YunoHost-Apps/gitea_ynh/issues>
+
+## Ontwikkelaarsinformatie
+
+Stuur je pull request alsjeblieft naar de [`testing`-branch](https://github.com/YunoHost-Apps/gitea_ynh/tree/testing).
+
+Om de `testing`-branch uit te proberen, ga als volgt te werk:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/gitea_ynh/tree/testing --debug
+of
+sudo yunohost app upgrade gitea -u https://github.com/YunoHost-Apps/gitea_ynh/tree/testing --debug
+```
+
+**Verdere informatie over app-packaging:** <https://yunohost.org/packaging_apps>

README_ru.md

@@ -19,7 +19,7 @@
 Gitea is a fork of Gogs a self-hosted Git service written in Go. Alternative to GitHub.
 
 
-**Поставляемая версия:** 1.22.2~ynh1
+**Поставляемая версия:** 1.22.3~ynh1
 
 ## Снимки экрана
 

README_zh_Hans.md

@@ -19,7 +19,7 @@
 Gitea is a fork of Gogs a self-hosted Git service written in Go. Alternative to GitHub.
 
 
-**分发版本：** 1.22.2~ynh1
+**分发版本：** 1.22.3~ynh1
 
 ## 截图
 

conf/app.ini

@@ -1,3 +1,5 @@
+; WARNING: Don't edit this file. All change will be removed after each app upgrade
+
 ;https://github.com/go-gitea/gitea/blob/release/v1.20/custom/conf/app.example.ini
 APP_NAME = Gitea
 RUN_USER = __APP__

manifest.toml

@@ -7,7 +7,7 @@ name = "Gitea"
 description.en = "Lightweight Git forge"
 description.fr = "Forge Git légère"
 
-version = "1.22.2~ynh1"
+version = "1.22.3~ynh1"
 
 maintainers = ["Josué Tille"]
 # previous_maintainers = [
@@ -23,7 +23,8 @@ cpe = "cpe:2.3:a:gitea:gitea"
 fund = "https://opencollective.com/gitea"
 
 [integration]
-yunohost = ">= 11.2"
+yunohost = ">= 11.2.30"
+helpers_version = "2.1"
 architectures = [
     "amd64",
     "i386",
@@ -67,14 +68,14 @@ ram.runtime = "100M"
     extract = false
     rename = "gitea"
 
-    armhf.url = "https://github.com/go-gitea/gitea/releases/download/v1.22.2/gitea-1.22.2-linux-arm-6"
+    armhf.url = "https://github.com/go-gitea/gitea/releases/download/v1.22.3/gitea-1.22.3-linux-arm-6"
-    armhf.sha256 = "ae73c658c827acb25c510d5925e6f92f4f6eac935d847f0682ec9061f39f66d5"
+    armhf.sha256 = "28c92642acd87544b9bff9b1c333325abd3993659839f27d438a7ba9ae85ff6e"
-    arm64.url = "https://github.com/go-gitea/gitea/releases/download/v1.22.2/gitea-1.22.2-linux-arm64"
+    arm64.url = "https://github.com/go-gitea/gitea/releases/download/v1.22.3/gitea-1.22.3-linux-arm64"
-    arm64.sha256 = "a4df27d2cb9339bdea96cd51f694cdf2d2bd7301d38f4906ad3611a033537bae"
+    arm64.sha256 = "0d957ca51317be75788a7d286193fb550463c432518fb4b2dd05c19df3910b22"
-    i386.url = "https://github.com/go-gitea/gitea/releases/download/v1.22.2/gitea-1.22.2-linux-386"
+    i386.url = "https://github.com/go-gitea/gitea/releases/download/v1.22.3/gitea-1.22.3-linux-386"
-    i386.sha256 = "bd9e352ef9fce7797cd5a71b9f451c61f707d90a2c4192aa3e71090758c00b73"
+    i386.sha256 = "7bb4715606f66c6a1f42af53a1d9b61b684d8ab92258b423852b1d1b66487166"
-    amd64.url = "https://github.com/go-gitea/gitea/releases/download/v1.22.2/gitea-1.22.2-linux-amd64"
+    amd64.url = "https://github.com/go-gitea/gitea/releases/download/v1.22.3/gitea-1.22.3-linux-amd64"
-    amd64.sha256 = "310d7dfa48680f3eaa5fe2998ca7a8a1f707518c1772b64d85fb3b9e197188d3"
+    amd64.sha256 = "a720ff937912a6eb6c0cacf6ebcdd774deed5197cd945ecc34f5744cb5c517e8"
 
     autoupdate.strategy = "latest_github_release"
     autoupdate.asset.armhf = "^gitea-.*-linux-arm-6$"
@@ -88,9 +89,12 @@ ram.runtime = "100M"
     allow_email = true
 
     [resources.install_dir]
-    dir = "/opt/yunohost/__APP__"
+    owner = "__APP__:rwx"
+    group = "__APP__:r-x"
 
     [resources.data_dir]
+    owner = "__APP__:rwx"
+    group = "__APP__:r-x"
 
     [resources.permissions]
     main.url = "/"

scripts/_common.sh

@@ -15,13 +15,18 @@ _set_permissions() {
     chmod +x "$install_dir/gitea"
 
     chown -R "$app:$app" "$data_dir"
+    chmod u=rwx,g=rx,o= "$data_dir"
     find "$data_dir" \(   \! -perm -o= \
                      -o \! -user "$app" \
                      -o \! -group "$app" \) \
                    -exec chown "$app:$app" {} \; \
                    -exec chmod u=rwX,g=rX,o= {} \;
     chmod -R u=rwX,g=,o= "$data_dir/.ssh"
-
+}
-    chown -R "$app:$app" "/var/log/$app"
+
-    chmod -R u=rwX,g=rX,o= "/var/log/$app"
+set_settings_default() {
+    ynh_app_setting_set_default --key=internal_token --value="$(ynh_exec_as_app "$install_dir/gitea" generate secret INTERNAL_TOKEN)"
+    ynh_app_setting_set_default --key=secret_key --value="$(ynh_exec_as_app "$install_dir/gitea" generate secret SECRET_KEY)"
+    ynh_app_setting_set_default --key=lfs_jwt_secret --value="$(ynh_exec_as_app "$install_dir/gitea" generate secret JWT_SECRET)"
+    ynh_app_setting_set_default --key=jwt_secret --value="$(ynh_exec_as_app "$install_dir/gitea" generate secret JWT_SECRET)"
 }

scripts/backup

@@ -8,41 +8,35 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-
 if systemctl is-active "$app".service --quiet; then
-    ynh_print_warn --message="It's hightly recommended to make your backup when the service is stopped. Please stop $app service with this command before to run the backup 'systemctl stop $app.service'"
+    ynh_print_warn "It's hightly recommended to make your backup when the service is stopped. Please stop $app service with this command before to run the backup 'systemctl stop $app.service'"
 fi
 
-#=================================================
+ynh_print_info 'Declaring files to be backed up...'
-# DECLARE DATA AND CONF FILES TO BACKUP
-#=================================================
-ynh_print_info --message='Declaring files to be backed up...'
 
 # Copy the app source files
-ynh_backup --src_path="$install_dir"
+ynh_backup "$install_dir"
 
 # Copy the data files
-ynh_backup --src_path="$data_dir" --is_big=1
+ynh_backup "$data_dir"
 
 # Copy the conf files
-ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
+ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf"
 
-ynh_backup --src_path="/etc/fail2ban/jail.d/$app.conf"
+ynh_backup "/etc/fail2ban/jail.d/$app.conf"
-ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf"
+ynh_backup "/etc/fail2ban/filter.d/$app.conf"
 
-ynh_backup --src_path="/etc/logrotate.d/$app"
+ynh_backup "/etc/systemd/system/$app.service"
-
-ynh_backup --src_path="/etc/systemd/system/$app.service"
 
 # Backup logs
-ynh_backup --src_path="/var/log/$app"
+ynh_backup "/var/log/$app"
 
 # Dump the database
-ynh_print_info --message="Backing up the MySQL database"
+ynh_print_info "Backing up the MySQL database"
-ynh_mysql_dump_db "$db_name" > ./db.sql
+ynh_mysql_dump_db > ./db.sql
 
 #=================================================
 # END OF SCRIPT
 #=================================================
 
-ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)."
+ynh_print_info "Backup script completed for $app. (YunoHost will then actually copy those files to the archive)."

scripts/change_url

@@ -1,51 +1,41 @@
 #!/bin/bash
 
-#=================================================
-# GENERIC STARTING
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# STANDARD MODIFICATIONS
 #=================================================
 # STOP SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Stopping a systemd service..." --weight=1
+ynh_script_progression "Stopping $app's systemd service..."
 
-ynh_systemd_action --service_name="$app" --action=stop
+ynh_systemctl --service="$app" --action=stop
 
 #=================================================
 # MODIFY URL IN NGINX CONF
 #=================================================
-ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1
+ynh_script_progression "Updating NGINX web server configuration..."
 
-ynh_change_url_nginx_config
+ynh_config_change_url_nginx
 
 #=================================================
 # SPECIFIC MODIFICATIONS
 #=================================================
 # Setup gitea.ini
 #=================================================
-ynh_script_progression --message="Updating gitea configuration..."
+ynh_script_progression "Updating gitea configuration..."
 
-ynh_add_config --template="app.ini" --destination="$install_dir/custom/conf/app.ini"
+ynh_config_add --template="app.ini" --destination="$install_dir/custom/conf/app.ini"
 _set_permissions
 
-#=================================================
-# GENERIC FINALISATION
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Starting gitea services..." --weight=3
+ynh_script_progression "Starting gitea services..."
 
-ynh_systemd_action --service_name="$app" --action=start --log_path="/var/log/$app/gitea.log" --line_match="$systemd_match_start_line"
+ynh_systemctl --service="$app" --action=start --log_path="/var/log/$app/gitea.log" --wait_until="$systemd_match_start_line"
 
 #=================================================
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Change of URL completed for $app" --last
+ynh_script_progression "Change of URL completed for $app"

scripts/install

@@ -1,21 +1,17 @@
 #!/bin/bash
 
-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
 source _common.sh
 source /usr/share/yunohost/helpers
 
+ynh_app_setting_set --key=protect_against_basic_auth_spoofing --value=false
+
 #=================================================
 # APP "BUILD" (DEPLOYING SOURCES, VENV, COMPILING ETC)
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
 
-ynh_script_progression --message='Creating base directory...'
+ynh_script_progression 'Creating base directory...'
 
 if [ -n "$(ls -A "$data_dir")" ]; then
     old_data_dir_path="${data_dir}_$(date '+%Y%m%d.%H%M%S')"
@@ -34,45 +30,37 @@ mkdir -p "$data_dir/repositories"
 mkdir -p "$data_dir/data/avatars"
 mkdir -p "$data_dir/data/attachments"
 
-ynh_script_progression --message='Installing sources files and data directories...' --weight=10
+ynh_script_progression 'Installing sources files and data directories...'
 
 # Setup source
 ynh_setup_source --dest_dir="$install_dir"
 _set_permissions
 
-ynh_script_progression --message="Configuring application, step 1/2..."
+ynh_script_progression "Configuring application, step 1/2..."
 
-internal_token="$(ynh_exec_as "$app" "$install_dir/gitea" generate secret INTERNAL_TOKEN)"
+set_settings_default
-secret_key="$(ynh_exec_as "$app" "$install_dir/gitea" generate secret SECRET_KEY)"
-lfs_jwt_secret="$(ynh_exec_as "$app" "$install_dir/gitea" generate secret JWT_SECRET)"
-jwt_secret="$(ynh_exec_as "$app" "$install_dir/gitea" generate secret JWT_SECRET)"
 
-ynh_app_setting_set --app="$app" --key=internal_token --value="$internal_token"
+ynh_config_add --template='app.ini' --destination="$install_dir/custom/conf/app.ini"
-ynh_app_setting_set --app="$app" --key=secret_key --value="$secret_key"
-ynh_app_setting_set --app="$app" --key=lfs_jwt_secret --value="$lfs_jwt_secret"
-ynh_app_setting_set --app="$app" --key=jwt_secret --value="$jwt_secret"
-
-ynh_add_config --template='app.ini' --destination="$install_dir/custom/conf/app.ini"
 
 #=================================================
 # SYSTEM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Adding system configurations related to $app..." --weight=1
+ynh_script_progression "Adding system configurations related to $app..."
 
 # Create a dedicated NGINX config using the conf/nginx.conf template
-ynh_add_nginx_config
+ynh_config_add_nginx
 
 # Create a dedicated systemd config
-ynh_add_systemd_config
+ynh_config_add_systemd
 
 # Add gitea to YunoHost's monitored services
 yunohost service add "$app" --log="/var/log/$app/gitea.log"
 
 # Configure logrotate
-ynh_use_logrotate --logfile="/var/log/$app"
+ynh_config_add_logrotate "/var/log/$app"
 
 # Create a dedicated Fail2Ban config
-ynh_add_fail2ban_config --logpath="/var/log/$app/gitea.log" --failregex='.*Failed authentication attempt for .* from <HOST>' --max_retry=5
+ynh_config_add_fail2ban --logpath="/var/log/$app/gitea.log" --failregex='.*Failed authentication attempt for .* from <HOST>'
 
 #=================================================
 # APP INITIAL CONFIGURATION
@@ -80,30 +68,28 @@ ynh_add_fail2ban_config --logpath="/var/log/$app/gitea.log" --failregex='.*Faile
 # ADD A CONFIGURATION
 #=================================================
 
-ynh_script_progression --message='Configuring application, step 2/2...'
+ynh_script_progression 'Configuring application, step 2/2...'
 _set_permissions
 
 # Start gitea for building mysql tables
-ynh_systemd_action --service_name="$app" --action=start --log_path="/var/log/$app/gitea.log" --line_match="$systemd_match_start_line"
+ynh_systemctl --service="$app" --action=start --log_path="/var/log/$app/gitea.log" --wait_until="$systemd_match_start_line"
 
 # Add ldap config
-ynh_replace_string --match_string=__APP__ --replace_string="$app" --target_file=./login_source.sql
+ynh_replace --match=__APP__ --replace="$app" --file=./login_source.sql
-ynh_replace_string --match_string=__GROUP_TEAM_MAP__ --replace_string='""' --target_file=./login_source.sql
+ynh_replace --match=__GROUP_TEAM_MAP__ --replace='""' --file=./login_source.sql
-ynh_mysql_connect_as "$db_user" "$db_pwd" "$db_name" < ./login_source.sql
+ynh_mysql_db_shell < ./login_source.sql
 
 # Stop the service to restart it just afterwards
-ynh_systemd_action --service_name="$app" --action='stop' --log_path="/var/log/$app/gitea.log"
+ynh_systemctl --service="$app" --action='stop' --log_path="/var/log/$app/gitea.log"
 
-#=================================================
-# GENERIC FINALIZATION
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message='Starting gitea services...' --weight=3
+ynh_script_progression 'Starting gitea services...'
 
-ynh_systemd_action --service_name="$app" --action=start --log_path="/var/log/$app/gitea.log" --line_match="$systemd_match_start_line"
+ynh_systemctl --service="$app" --action=start --log_path="/var/log/$app/gitea.log" --wait_until="$systemd_match_start_line"
 
 #=================================================
 # END OF SCRIPT
 #=================================================
-ynh_script_progression --message="Installation of $app completed" --last
+ynh_script_progression "Installation of $app completed"

scripts/remove

@@ -10,24 +10,24 @@ source /usr/share/yunohost/helpers
 #=================================================
 # REMOVE SYSTEM CONFIGURATIONS
 #=================================================
-ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
+ynh_script_progression "Removing system configurations related to $app..."
 
-if ynh_exec_warn_less yunohost service status "$app" >/dev/null
+if ynh_hide_warnings yunohost service status "$app" >/dev/null
 then
-	ynh_script_progression --message="Removing $app service integration..." --weight=1
+	ynh_script_progression "Removing $app service integration..."
 	yunohost service remove "$app"
 fi
 
-ynh_remove_systemd_config
+ynh_config_remove_systemd
 
-ynh_remove_nginx_config
+ynh_config_remove_nginx
 
-ynh_remove_logrotate
+ynh_config_remove_logrotate
 
-ynh_remove_fail2ban_config
+ynh_config_remove_fail2ban
 
 #=================================================
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Removal of $app completed" --last
+ynh_script_progression "Removal of $app completed"

scripts/restore

@@ -11,21 +11,21 @@ source /usr/share/yunohost/helpers
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
-ynh_script_progression --message="Restoring the app files..." --weight=1
+ynh_script_progression "Restoring the app files..."
-ynh_restore
+ynh_restore_everything
 _set_permissions
 
 #=================================================
 # RESTORE THE MYSQL DATABASE
 #=================================================
-ynh_script_progression --message="Restoring the MySQL database..." --weight=1
+ynh_script_progression "Restoring the MySQL database..."
 
-ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" < ./db.sql
+ynh_mysql_db_shell < ./db.sql
 
 #=================================================
 # RESTORE SYSTEM CONFIGURATIONS
 #=================================================
-ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1
+ynh_script_progression "Restoring system configurations related to $app..."
 
 systemctl daemon-reload
 systemctl enable "$app".service --quiet
@@ -33,23 +33,24 @@ systemctl enable "$app".service --quiet
 yunohost service add "$app" --log="/var/log/$app/gitea.log"
 
 # SETUP FAIL2BAN
-ynh_script_progression --message="Configuring fail2ban..."
+ynh_script_progression "Configuring fail2ban..."
-ynh_add_fail2ban_config --logpath="/var/log/$app/gitea.log" --failregex=".*Failed authentication attempt for .* from <HOST>" --max_retry=5
+ynh_config_add_fail2ban --logpath="/var/log/$app/gitea.log" --failregex=".*Failed authentication attempt for .* from <HOST>"
+
+mkdir -p /var/log/"$app"
+ynh_config_add_logrotate
 
-#=================================================
-# GENERIC FINALIZATION
 #=================================================
 # RELOAD NGINX AND PHP-FPM OR THE APP SERVICE
 #=================================================
-ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1
+ynh_script_progression "Reloading NGINX web server and $app's service..."
 
 # 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/gitea.log" --line_match="$systemd_match_start_line"
+ynh_systemctl --service="$app" --action=start --log_path="/var/log/$app/gitea.log" --wait_until="$systemd_match_start_line"
 
-ynh_systemd_action --service_name=nginx --action=reload
+ynh_systemctl --service=nginx --action=reload
 
 #=================================================
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Restoration completed for $app" --last
+ynh_script_progression "Restoration completed for $app"

scripts/upgrade

@@ -1,36 +1,28 @@
 #!/bin/bash
 
-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
 source _common.sh
 source /usr/share/yunohost/helpers
 
-upgrade_type="$(ynh_check_app_version_changed)"
+ynh_app_setting_set --key=protect_against_basic_auth_spoofing --value=false
 
-#=================================================
-# STANDARD UPGRADE STEPS
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
 #=================================================
-ynh_script_progression --message='Ensuring downward compatibility...' --weight=1
+ynh_script_progression 'Ensuring downward compatibility...'
 
-if ynh_compare_current_package_version --comparison=lt --version="1.6.4~ynh1"; then
+if ynh_app_upgrading_from_version_before 1.6.4~ynh1; then
     message="Upgrade from $YNH_APP_CURRENT_VERSION was dropped. You need to run this, then upgrade to the latest version:
 sudo yunohost app upgrade $app -u https://github.com/YunoHost-Apps/gitea_ynh/commit/a9ceb157032ae2290e944c1d0a255451ff2d133d"
     ynh_print_info "$message"
-    ynh_die --message="$message" --ret_code=1
+    ynh_die "$message" --ret_code=1
 fi
 
 #=================================================
 # STOP SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message='Stopping a systemd service...' --weight=1
+ynh_script_progression "Stopping $app's systemd service..."
 
-ynh_systemd_action --service_name="$app" --action=stop
+ynh_systemctl --service="$app" --action=stop
 
 #=================================================
 # MIGRATION STEP 1 (migrate path from packagin v1)
@@ -40,7 +32,7 @@ ynh_systemd_action --service_name="$app" --action=stop
 if [ -d "/opt/$app" ]; then
     # This is the package version of the manifestv2
     mv -t "$install_dir/" "/opt/$app/"*
-    ynh_secure_remove --file="/opt/$app"
+    ynh_safe_rm "/opt/$app"
 fi
 
 # Move data directory
@@ -53,45 +45,24 @@ if [ ~"$app" != "$data_dir" ]; then
     usermod --home "$data_dir" "$app"
 fi
 
-if [ "$upgrade_type" == UPGRADE_APP ]; then
+ynh_setup_source --dest_dir="$install_dir" --source_id=main --full_replace --keep=custom
-    ynh_setup_source --dest_dir="$install_dir" --source_id=main --full_replace=1 --keep=custom
-fi
 
 #=================================================
 # MIGRATION STEP 2 (Set undefined Vars)
 #=================================================
 
-ynh_script_progression --message='Migrating missing settings...'
+ynh_script_progression 'Migrating missing settings...'
 
 # Must set permission before to call gitea command
 chown -R "$app:$app" "$install_dir"
 chmod -R u=rwX,g=rX,o= "$install_dir"
 chmod +x "$install_dir/gitea"
 
-if [[ -z "${internal_token:-}" ]]; then
+set_settings_default
-    internal_token="$(ynh_exec_as "$app" "$install_dir/gitea" generate secret INTERNAL_TOKEN)"
-    ynh_app_setting_set --app="$app" --key=internal_token --value="$internal_token"
-fi
-
-if [[ -z "${secret_key:-}" ]]; then
-    secret_key="$(ynh_exec_as "$app" "$install_dir/gitea" generate secret SECRET_KEY)"
-    ynh_app_setting_set --app="$app" --key=secret_key --value="$secret_key"
-fi
-
 if [[ -n "${lfs_key:-}" ]]; then
     lfs_jwt_secret="$lfs_key"
-    ynh_app_setting_delete --app="$app" --key=lfs_key
+    ynh_app_setting_delete --key=lfs_key
-    ynh_app_setting_set --app="$app" --key=lfs_jwt_secret --value="$lfs_jwt_secret"
+    ynh_app_setting_set --key=lfs_jwt_secret --value="$lfs_jwt_secret"
-fi
-
-if [[ -z "${lfs_jwt_secret:-}" ]]; then
-    lfs_jwt_secret="$(ynh_exec_as "$app" "$install_dir/gitea" generate secret JWT_SECRET)"
-    ynh_app_setting_set --app="$app" --key=lfs_jwt_secret --value="$lfs_jwt_secret"
-fi
-
-if [[ -z "${jwt_secret:-}" ]]; then
-    jwt_secret="$(ynh_exec_as "$app" "$install_dir/gitea" generate secret JWT_SECRET)"
-    ynh_app_setting_set --app="$app" --key=jwt_secret --value="$jwt_secret"
 fi
 
 #=================================================
@@ -99,22 +70,22 @@ fi
 #=================================================
 
 list_param_sql="$(yunohost user list --output-as json | jq -c '.users | keys' | sed 's|\[|\(|' | sed 's|\]|\)|')"
-ynh_replace_string --match_string=__APP__ --replace_string="$app" --target_file=./fix_user_db_for_local_users.sql
+ynh_replace --match=__APP__ --replace="$app" --file=./fix_user_db_for_local_users.sql
-ynh_replace_string --match_string=__USER_LIST__ --replace_string="$list_param_sql" --target_file=./fix_user_db_for_local_users.sql
+ynh_replace --match=__USER_LIST__ --replace="$list_param_sql" --file=./fix_user_db_for_local_users.sql
-ynh_mysql_connect_as "$db_user" "$db_pwd" "$db_name" < ./fix_user_db_for_local_users.sql
+ynh_mysql_db_shell < ./fix_user_db_for_local_users.sql
 
 #=================================================
 # UPDATE A CONFIG FILE
 #=================================================
-ynh_script_progression --message='Updating configuration files...' --weight=1
+ynh_script_progression 'Updating configuration files...'
 
 # Clean template to fix issue : https://github.com/gogits/gogs/issues/4585
-ynh_secure_remove --file="$install_dir/templates"
+ynh_safe_rm "$install_dir/templates"
 
 # Configure gitea with app.ini file
-ynh_add_config --template=app.ini --destination="$install_dir/custom/conf/app.ini"
+ynh_config_add --template=app.ini --destination="$install_dir/custom/conf/app.ini"
 
-ynh_script_progression --message='Setting permissions...'
+ynh_script_progression 'Setting permissions...'
 _set_permissions
 
 # Update ldap config
@@ -124,33 +95,33 @@ _set_permissions
 group_team_map_config=$(mysql --user="$db_user" --password="$db_pwd" --batch --raw "$db_name" <<< 'SELECT `cfg` FROM `'$app'`.`login_source` WHERE `id`=1;' \
     | tail -n+2 | jq '.GroupTeamMap')
 sed -i 's|__GROUP_TEAM_MAP__|'"${group_team_map_config//\\/\\\\\\\\}"'|g' ./login_source.sql
-ynh_replace_string --match_string=__APP__ --replace_string="$app" --target_file=./login_source.sql
+ynh_replace --match=__APP__ --replace="$app" --file=./login_source.sql
-ynh_mysql_connect_as "$db_user" "$db_pwd" "$db_name" < ./login_source.sql
+ynh_mysql_db_shell < ./login_source.sql
 
 #=================================================
 # REAPPLY SYSTEM CONFIGURATIONS
 #=================================================
-ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1
+ynh_script_progression "Upgrading system configurations related to $app..."
 
-ynh_add_nginx_config
+ynh_config_add_nginx
 
-ynh_add_systemd_config
+ynh_config_add_systemd
 
 yunohost service add "$app" --log="/var/log/$app/gitea.log"
 
-ynh_use_logrotate --non-append
+ynh_config_add_logrotate
 
-ynh_add_fail2ban_config --logpath="/var/log/$app/gitea.log" --failregex=".*Failed authentication attempt for .* from <HOST>" --max_retry=5
+ynh_config_add_fail2ban --logpath="/var/log/$app/gitea.log" --failregex=".*Failed authentication attempt for .* from <HOST>"
 
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message='Starting a systemd service...' --weight=1
+ynh_script_progression "Starting $app's systemd service..."
 
-ynh_systemd_action --service_name="$app" --action=start --log_path="/var/log/$app/gitea.log" --line_match="$systemd_match_start_line"
+ynh_systemctl --service="$app" --action=start --log_path="/var/log/$app/gitea.log" --wait_until="$systemd_match_start_line"
 
 #=================================================
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Upgrade of $app completed" --last
+ynh_script_progression "Upgrade of $app completed"

tests.toml

@@ -18,3 +18,5 @@ test_format = 1.0
     test_upgrade_from.67d5bc5dc57d8f8793551d7e07c10e8b9d4fe038.args.admin = "package_checker"
     test_upgrade_from.67d5bc5dc57d8f8793551d7e07c10e8b9d4fe038.args.path = "/"
     test_upgrade_from.67d5bc5dc57d8f8793551d7e07c10e8b9d4fe038.args.domain = "domain.tld"
+
+    test_upgrade_from.9f68c61d65babd9ab91a0425e55616f05b547ced.name = "Before helper 2.1"