diff --git a/conf/app.src b/conf/app.src index 0dc7885..440927d 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,8 +1,5 @@ -SOURCE_URL=https://download.noalyss.eu/derniere-version/noalyss-9011.tar.gz -SOURCE_SUM=0424c9c7e82bb9a3dd3402f0b5ea8259176a2dbe388a942393e68b4dbf41d59d +SOURCE_URL=https://download.noalyss.eu/derniere-version/noalyss-9020.tar.gz +SOURCE_SUM=c7b03fd0216866b85f12da84f2c913362749e000a98ce2e853de5c3c01b2ba19 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= - - diff --git a/conf/nginx.conf b/conf/nginx.conf index 873ea75..742bc1f 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,11 +4,6 @@ location __PATH__/ { # Path to source alias __FINALPATH__/html/ ; - # 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 diff --git a/manifest.json b/manifest.json index 423e8f0..b0d9c6f 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Accounting free software (Beligum and French accounting)", "fr": "Logiciel libre de comptabilité (comptabilité Belge et Française)" }, - "version": "9.0.1.1~ynh1", + "version": "9.0.2.0~ynh1", "url": "http://noalyss.eu", "upstream": { "license": "AGPL-3.0-only", @@ -21,7 +21,7 @@ "url": "https://computhings.be" }, "requirements": { - "yunohost": ">= 4.2.4" + "yunohost": ">= 4.3.0" }, "multi_instance": false, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index a87cd64..8e86cdb 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,9 +5,7 @@ YNH_PHP_VERSION="7.3" -pkg_dependencies="postgresql apt-transport-https libgd-dev" - -extra_php_dependencies="php${YNH_PHP_VERSION}-pgsql php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd php-php-gettext" +pkg_dependencies="postgresql apt-transport-https libgd-dev php${YNH_PHP_VERSION}-pgsql php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd php-php-gettext" #================================================= # COMMON HELPERS diff --git a/scripts/install b/scripts/install index 3156711..2a6df83 100755 --- a/scripts/install +++ b/scripts/install @@ -102,7 +102,7 @@ ynh_add_nginx_config ynh_script_progression --message="Configuring PHP-FPM..." --weight=3 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies" +ynh_add_fpm_config --usage=low --footprint=low phpversion=$(ynh_app_setting_get --app="$app" --key=phpversion) # #================================================= diff --git a/scripts/restore b/scripts/restore index b65e626..127f3f3 100755 --- a/scripts/restore +++ b/scripts/restore @@ -72,9 +72,6 @@ ynh_script_progression --message="Restoring PHP-FPM configuration..." ynh_restore_file "/etc/php/$phpversion/fpm/pool.d/$app.conf" -# Recreate a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies" - #================================================= # SPECIFIC RESTORATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 10b9be6..9068031 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -126,7 +126,7 @@ ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies" +ynh_add_fpm_config --usage=low --footprint=low #================================================= # SETUP APPLICATION WITH CURL