Merge branch 'testing' into add-notify_push-option

scripts/_common.sh

@@ -9,8 +9,8 @@
 #=================================================
 
 wait_nginx_reload() {
-    # Nginx may take some time to support the new configuration,
+    # NGINX may take some time to support the new configuration,
-    # wait for the nextcloud configuration file to disappear from nginx before checking the CalDAV/CardDAV URL.
+    # wait for the Nextcloud configuration file to disappear from NGINX before checking the CalDAV/CardDAV URL.
     timeout=30
     for i in $(seq 1 $timeout); do
         if ! ynh_exec_warn_less nginx -T | grep --quiet "# configuration file /etc/nginx/conf.d/$domain.d/$app.conf:"; then
@@ -18,7 +18,7 @@ wait_nginx_reload() {
         fi
         sleep 1
     done
-    # Wait untils nginx has fully reloaded (avoid curl fail with http2) 
+    # Wait untils NGINX has fully reloaded (avoid cURL fail with http2) 
     sleep 2
 }
 
@@ -33,22 +33,22 @@ is_url_handled() {
     # Manage arguments with getopts
     ynh_handle_getopts_args "$@"
 
-    # Try to get the url with curl, and keep the http code and an eventual redirection url.
+    # Try to get the URL with cURL, and keep the http code and an eventual redirection URL.
     local curl_output="$(curl --insecure --silent --output /dev/null \
       --write-out '%{http_code};%{redirect_url}' https://127.0.0.1$path --header "Host: $domain" --resolve $domain:443:127.0.0.1)"
 
     # Cut the output and keep only the first part to keep the http code
     local http_code="${curl_output%%;*}"
-    # Do the same thing but keep the second part, the redirection url
+    # Do the same thing but keep the second part, the redirection URL
     local redirection="${curl_output#*;}"
 
-    # Return 1 if the url isn't handled.
+    # Return 1 if the URL isn't handled.
-    # Which means either curl got a 404 (or the admin) or the sso.
+    # Which means either cURL got a 404 (or the admin) or the SSO.
-    # A handled url should redirect to a publicly accessible url.
+    # A handled URL should redirect to a publicly accessible URL.
-    # Return 1 if the url has returned 404
+    # Return 1 if the URL has returned 404
     if [ "$http_code" = "404" ] || [[ $redirection =~ "/yunohost/admin" ]]; then
         return 1
-    # Return 1 if the url is redirected to the SSO
+    # Return 1 if the URL is redirected to the SSO
     elif [[ $redirection =~ "/yunohost/sso" ]]; then
         return 1
     fi

scripts/backup

@@ -38,33 +38,25 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.d"
 # BACKUP THE PHP-FPM CONFIGURATION
 #=================================================
 
+# Backup the PHP-FPM configuration
 ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
-#=================================================
+# Backup the nginx configuration
-# SPECIFIC BACKUP
+ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-#=================================================
-# BACKUP LOGROTATE
-#=================================================
 
+# Backup the logrotate configuration
 ynh_backup --src_path="/etc/logrotate.d/$app"
 
-#=================================================
+# Backup the Fail2Ban config
-# BACKUP FAIL2BAN CONFIGURATION
-#=================================================
-
 ynh_backup --src_path="/etc/fail2ban/jail.d/$app.conf"
 ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf"
 
 #=================================================
-# BACKUP THE CRON FILE
+# BACKUP VARIOUS FILES
 #=================================================
 
 ynh_backup --src_path="/etc/cron.d/$app"
 
-#=================================================
-# BACKUP LOGS
-#=================================================
-
 ynh_backup --src_path="/var/log/$app"
 
 #=================================================

scripts/change_url

@@ -48,7 +48,7 @@ then
     # Change hostname for activity notifications
     exec_occ config:system:set overwrite.cli.url --value="https://${new_domain}${new_path}"
 
-    # Reload php fpm, necessary for force nextcloud to re-read config.php, cf opcache.revalidate_freq
+    # Reload PHP-FPM, necessary for force Nextcloud to re-read config.php, cf opcache.revalidate_freq
     ynh_systemd_action --service_name=php${phpversion}-fpm --action=reload
 
     mv /etc/nginx/conf.d/$old_domain.d/$app.d /etc/nginx/conf.d/$new_domain.d/$app.d