v2

check_process

@@ -1,25 +0,0 @@
-;; Test complet
-	; Manifest
-		domain="domain.tld"
-		path="/path"
-		admin="john"
-	; Checks
-		pkg_linter=1
-		setup_sub_dir=1
-		setup_root=1
-		setup_nourl=0
-		setup_private=0
-		setup_public=0
-		upgrade=1
-		upgrade=1	from_commit=244f3cbdf29d6c694154ec08cead5e27d35c26fc
-		backup_restore=1
-		multi_instance=1
-		port_already_use=0
-		change_url=1
-;;; Options
-Email=
-Notification=none
-;;; Upgrade options
-	; commit=CommitHash
-		name=5 Jul 2019
-		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&

conf/nginx.conf

@@ -2,7 +2,7 @@
 location __PATH__/ {
 
   # Path to source
-  alias __INSTALL_DIR__/htdocs/ ;
+  alias __INSTALL_DIR__/htdocs/;
 
   index index.php;
 

manifest.json

@@ -1,52 +0,0 @@
-{
-    "name": "Dolibarr",
-    "id": "dolibarr",
-    "packaging_format": 1,
-    "description": {
-        "en": "Manage the various aspects of your business or association",
-        "fr": "Gérez les différents aspects de votre activité pro ou associative"
-    },
-    "version": "17.0.0~ynh1",
-    "url": "https://www.dolibarr.org/",
-    "upstream": {
-        "license": "GPL-3.0-or-later",
-        "website": "https://www.dolibarr.org/",
-        "demo": "https://www.dolibarr.org/onlinedemo",
-        "admindoc": "https://www.dolibarr.org/documentation-home",
-        "userdoc": "https://www.dolibarr.org/#features",
-        "code": "https://github.com/Dolibarr/dolibarr",
-        "cpe": "cpe:2.3:a:dolibarr:dolibarr"
-    },
-    "license": "GPL-3.0-or-later",
-    "maintainer": {
-        "name": "mastereur",
-        "url": "https://github.com/mastereur"
-    },
-    "requirements": {
-        "yunohost": ">= 11.0"
-    },
-    "multi_instance": true,
-    "services": [
-        "nginx",
-        "php7.4-fpm",
-        "mysql"
-    ],
-    "arguments": {
-        "install": [
-            {
-                "name": "domain",
-                "type": "domain"
-            },
-            {
-                "name": "path",
-                "type": "path",
-                "example": "/dolibarr",
-                "default": "/dolibarr"
-            },
-            {
-                "name": "admin",
-                "type": "user"
-            }
-        ]
-    }
-}

manifest.toml

@@ -21,7 +21,7 @@ code = "https://github.com/Dolibarr/dolibarr"
 yunohost = ">= 11.1.19"
 architectures = "all"
 multi_instance = true
-ldap = false
+ldap = true
 sso = false
 disk = "50M"
 ram.build = "50M"

scripts/install

@@ -14,6 +14,8 @@ source /usr/share/yunohost/helpers
 #=================================================
 
 member=0
+fpm_footprint="medium"
+fpm_usage="medium"
 
 #=================================================
 # STORE SETTINGS FROM MANIFEST
@@ -22,6 +24,8 @@ ynh_script_progression --message="Storing installation settings..." --weight=2
 
 ynh_app_setting_set --app=$app --key=member --value=$member
 ynh_app_setting_set --app=$app --key=version --value=$(ynh_app_upstream_version "../manifest.json")
+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 MYSQL DATABASE
@@ -60,14 +64,8 @@ touch $install_dir/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
+ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint
 
 #=================================================
 # NGINX CONFIGURATION

scripts/upgrade

@@ -29,15 +29,15 @@ upgrade_type=$(ynh_check_app_version_changed)
 ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
 
 # If fpm_footprint doesn't exist, create it
-if [ -z "$fpm_footprint" ]; then
+if [ -z "${fpm_footprint:-}" ]; then
-	fpm_footprint=medium
+    fpm_footprint=low
-	ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint
+    ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint
 fi
 
 # If fpm_usage doesn't exist, create it
-if [ -z "$fpm_usage" ]; then
+if [ -z "${fpm_usage:-}" ]; then
-	fpm_usage=medium
+    fpm_usage=low
-	ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage
+    ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage
 fi
 
 # Delete existing ini configuration file (backward compatibility)

tests.toml

@@ -0,0 +1,3 @@
+test_format = 1.0
+
+[default]