Update to 16.0.1 & fix scripts

Update to 16.0.1 & fix scripts

README.md

@@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 Dolibarr ERP & CRM is a modern software for managing your professional or associative activity (contacts, invoices, orders, stocks, agenda, etc.).
 
-**Shipped version:** 16.0.0~ynh1
+**Shipped version:** 16.0.1~ynh1
 
 
 **Demo:** https://www.dolibarr.org/onlinedemo

README_fr.md

@@ -17,7 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 Dolibarr ERP & CRM est un logiciel moderne de gestion de votre activité professionnelle ou associative (contacts, factures, commandes, stocks, agenda, etc.).
 
-**Version incluse :** 16.0.0~ynh1
+**Version incluse :** 16.0.1~ynh1
 
 
 **Démo :** https://www.dolibarr.org/onlinedemo

conf/nginx.conf

@@ -4,11 +4,6 @@ location __PATH__/ {
   # Path to source
   alias __FINALPATH__/htdocs/ ;
 
-  # Force usage of https
-  if ($scheme = http) {
-    rewrite ^ https://$server_name$request_uri? permanent;
-  }
-
   index index.php;
 
   # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file

manifest.json

@@ -6,7 +6,7 @@
         "en": "Manage the various aspects of your business or association",
         "fr": "Gérez les différents aspects de votre activité pro ou associative"
     },
-    "version": "16.0.0~ynh1",
+    "version": "16.0.1~ynh1",
     "url": "https://www.dolibarr.org/",
     "upstream": {
         "license": "GPL-3.0-or-later",

scripts/install

@@ -25,6 +25,7 @@ path_url=$YNH_APP_ARG_PATH
 admin=$YNH_APP_ARG_ADMIN
 member=0
 #is_public=0
+phpversion=$YNH_PHP_VERSION
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -85,6 +86,19 @@ ynh_mysql_execute_as_root --sql="ALTER DATABASE $db_name charset=utf8"
 #=================================================
 ynh_script_progression --message="Setting up source files..." --weight=1
 
+
+# Load the last available version
+source upgrade.d/upgrade.last.sh
+
+# Create an app.src for the last version of nextcloud
+cat > ../conf/app.src << EOF
+SOURCE_URL=https://github.com/Dolibarr/dolibarr/archive/$next_version.tar.gz
+SOURCE_SUM=$dolibarr_source_sha256
+SOURCE_SUM_PRG=sha256sum
+SOURCE_FORMAT=tar.bz2
+SOURCE_IN_SUBDIR=true
+EOF
+
 ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 
 # Download, check integrity, uncompress and patch the source from app.src
@@ -100,9 +114,16 @@ touch $final_path/htdocs/conf/conf.php
 #=================================================
 ynh_script_progression --message="Configuring PHP-FPM" --weight=2
 
+fpm_footprint="medium"
+fpm_usage="medium"
+
+ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint
+ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage
+
 # Create a dedicated php-fpm config
 ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint
-phpversion=$(ynh_app_setting_get --app="$app" --key=phpversion)
+# Used by ynh_add_nginx_config
+phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
 # NGINX CONFIGURATION

scripts/upgrade

@@ -29,7 +29,7 @@ datadir=$final_path/documents/
 
 fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint)
 fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage)
-phpversion=$(ynh_app_setting_get --app="$app" --key=phpversion)
+phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
 # CHECK VERSION

scripts/upgrade.d/upgrade.last.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Target version of the Dolibarr update
-next_version="16.0.0"
+next_version="16.0.1"
 
 # Dolibarr tarball checksum
-dolibarr_source_sha256="76a642d74cd3e4fe86fdeccffacd0fa2b22a398dc03e7ad92edb34d033b17b2f"
+dolibarr_source_sha256="f3614cf7b08c80d1aed4ebe0434008b2b03867d12b85df45b682c217ecb16573"