Merge pull request #350 from ericgaspar/v.20.0.2

Upgrade to version 20.0.2

README.md

@@ -4,6 +4,7 @@
 [![Install Nextcloud with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=nextcloud)
 
 *[Lire ce readme en français.](./README_fr.md)*
+
 > *This package allow you to install Nextcloud quickly and simply on a YunoHost server.  
 If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.*
 
@@ -11,8 +12,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
 
 [Nextcloud](https://nextcloud.com) gives you freedom and control over your own data. A personal cloud which runs on your own server. With Nextcloud you can synchronize your files over your devices.
 
-
-**Shipped version:** 20.0.1
+**Shipped version:** 20.0.2
 
 ## Screenshots
 

README_fr.md

@@ -5,7 +5,6 @@
 
 *[Read this readme in english.](./README.md)* 
 
-
 > *Ce package vous permet d'installer Nextcloud rapidement et simplement sur un serveur YunoHost.   
 Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
 
@@ -14,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 [Nextcloud](https://nextcloud.com) vous donne la liberté et le contrôle sur vos données. Un nuage personnel qui tourne sur votre serveur.
 Avec NextCloud vous pouvez synchroniser vos fichiers sur vos appareils.
 
-**Version incluse :** 20.0.1
+**Version incluse :** 20.0.2
 
 ## Captures d'écran
 
@@ -98,7 +97,7 @@ sudo yunohost app setting nextcloud label -v "Nextcloud"
 sudo yunohost app ssowatconf
 ```
 
-## Links
+## Liens
 
  * Signaler un bug : https://github.com/YunoHost-Apps/nextcloud_ynh/issues
  * Site web de Nextcloud : https://nextcloud.com/

manifest.json

@@ -6,7 +6,7 @@
         "en": "Online storage, file sharing platform and various other applications",
         "fr": "Stockage en ligne, plateforme de partage de fichiers et diverses autres applications"
     },
-    "version": "20.0.1~ynh1",
+    "version": "20.0.2~ynh1",
     "url": "https://nextcloud.com",
     "license": "AGPL-3.0",
     "maintainer": {

scripts/backup

@@ -26,6 +26,7 @@ app=$YNH_APP_INSTANCE_NAME
 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)
 
 #=================================================
 # DECLARE DATA AND CONF FILES TO BACKUP
@@ -48,7 +49,7 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 # BACKUP THE PHP-FPM CONFIGURATION
 #=================================================
 
-ynh_backup --src_path="/etc/php/$YNH_PHP_VERSION/fpm/pool.d/$app.conf"
+ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
 #=================================================
 # BACKUP THE MYSQL DATABASE

scripts/config

@@ -77,7 +77,7 @@ apply_config() {
 
         if [ "$fpm_footprint" != "0" ]
         then
-            ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$YNH_PHP_VERSION
+            ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint
         else
             ynh_print_err --message="When selecting 'specific', you have to set a footprint value into the field below."
         fi

scripts/install

@@ -138,7 +138,7 @@ ynh_script_progression --message="Installing Nextcloud..." --weight=30
 # Define a function to execute commands with `occ`
 exec_occ() {
   (cd "$final_path" && exec_as "$app" \
-      php$YNH_PHP_VERSION occ --no-interaction --no-ansi "$@")
+      php${phpversion} occ --no-interaction --no-ansi "$@")
 }
 
 # Set write access for the following commands
@@ -267,7 +267,7 @@ chmod 644 "$cron_path"
 
 ynh_replace_string --match_string="__USER__" --replace_string="$app" --target_file="$cron_path"
 ynh_replace_string --match_string="__DESTDIR__" --replace_string="$final_path" --target_file="$cron_path"
-ynh_replace_string --match_string="__YNH_PHP_VERSION__" --replace_string="$YNH_PHP_VERSION" --target_file="$cron_path"
+ynh_replace_string --match_string="__YNH_PHP_VERSION__" --replace_string="$phpversion" --target_file="$cron_path"
 
 exec_occ background:cron
 

scripts/restore

@@ -27,6 +27,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)
+phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint)
 fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage)
@@ -98,10 +99,10 @@ ynh_install_app_dependencies $pkg_dependencies
 ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=50
 
 # Restore the file first, so it can have a backup if different
-ynh_restore_file --origin_path="/etc/php/$YNH_PHP_VERSION/fpm/pool.d/$app.conf"
+ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
 # Recreate a dedicated php-fpm config
-ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies"
+ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --package="$extra_php_dependencies"
 
 #=================================================
 # RESTORE THE CRON FILE

scripts/upgrade

@@ -22,6 +22,7 @@ admin=$(ynh_app_setting_get --app=$app --key=admin)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 user_home=$(ynh_app_setting_get --app=$app --key=user_home)
+phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint)
 fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage)
@@ -154,14 +155,12 @@ ynh_system_user_create --username=$app
 ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2
 
 # Recreate a dedicated PHP-FPM config
-ynh_add_fpm_config --phpversion="$YNH_PHP_VERSION" --usage=$fpm_usage --footprint=$fpm_footprint --package="$extra_php_dependencies"
+ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --package="$extra_php_dependencies"
 
 # Delete existing ini configuration file (backward compatibility)
-if [ -f /etc/php/$YNH_PHP_VERSION/fpm/conf.d/20-$app.ini ]; then
-	ynh_secure_remove --file=/etc/php/$YNH_PHP_VERSION/fpm/conf.d/20-$app.ini
+if [ -f /etc/php/$phpversion/fpm/conf.d/20-$app.ini ]; then
+	ynh_secure_remove --file=/etc/php/$phpversion/fpm/conf.d/20-$app.ini
 fi
-# Used by ynh_add_nginx_config
-phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
 # NGINX CONFIGURATION
@@ -201,7 +200,7 @@ exec_occ() {
     # Backward compatibility to upgrade from NC14 or older version
     if [ $current_major_version = "last" ] || [ $current_major_version -ge 15 ]
     then
-        NEXTCLOUD_PHP_VERSION=$YNH_PHP_VERSION
+        NEXTCLOUD_PHP_VERSION=$phpversion
     else
         NEXTCLOUD_PHP_VERSION="7.0"
     fi
@@ -404,7 +403,7 @@ chmod 644 "$cron_path"
 
 ynh_replace_string --match_string="__USER__" --replace_string="$app" --target_file="$cron_path"
 ynh_replace_string --match_string="__DESTDIR__" --replace_string="$final_path" --target_file="$cron_path"
-ynh_replace_string --match_string="__YNH_PHP_VERSION__" --replace_string="$YNH_PHP_VERSION" --target_file="$cron_path"
+ynh_replace_string --match_string="__YNH_PHP_VERSION__" --replace_string="$phpversion" --target_file="$cron_path"
 
 exec_occ background:cron
 

scripts/upgrade.d/upgrade.last.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Last available nextcloud version
-next_version="20.0.1"
+next_version="20.0.2"
 
 # Nextcloud tarball checksum sha256
-nextcloud_source_sha256="96c6b50e1e676e46cec82d8f8ff1abd5eef9dfa00580081b6c640612c3ff2efc"
+nextcloud_source_sha256="be84c2ac7fba066ddc0637a4672b39628bbbd200dad8c00a0437a4765007dd21"