From 3788c661700553e8c94228e90f03b4e95d374586 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 28 Nov 2020 10:57:02 +0100
Subject: [PATCH] Fix

---
 conf/noalyss.conf |  8 ++++----
 manifest.json     | 33 +++++++++++++++++++++++++++------
 scripts/install   |  5 +++++
 3 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/conf/noalyss.conf b/conf/noalyss.conf
index 75f4a19..4f01960 100644
--- a/conf/noalyss.conf
+++ b/conf/noalyss.conf
@@ -12,13 +12,13 @@ define ("noalyss_psql_host","localhost");
 
 // If you change the NOALYSS_ADMINISTRATOR , you will need to rerun http://..../noalyss/html/install.php
 // But it doesn't change the password
-define ("NOALYSS_ADMINISTRATOR","admin");
+define ("NOALYSS_ADMINISTRATOR","__ADMIN__");
 // used only for install
-define ("NOALYSS_ADMIN_PASSWORD","");
+define ("NOALYSS_ADMIN_PASSWORD","__PASSWORD__");
 define ("LOCALE",1);
-define ("domaine","");
+define ("domaine","__DOMAIN__");
 define ("MULTI",1);
-define ("dbname","");
+define ("dbname","__DB_NAME__");
  // Uncomment to DEBUG
 // define ("DEBUG",TRUE);
 // Uncomment to log your input
diff --git a/manifest.json b/manifest.json
index a03a5ab..8336a0b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,21 +1,21 @@
 {
-    "name": "NOALYSS (phpcompta)",
+    "name": "Noalyss",
     "id": "noalyss",
     "packaging_format": 1,
     "description": {
         "en": "Accounting free software (Beligum and French accounting)",
         "fr": "Logiciel libre de comptabilité (comptabilité Belge et Française)"
     },
-    "version": "7.2~ynh1",
+    "version": "8.0~ynh1",
     "url": "http://noalyss.eu",
-    "license": "free",
+    "license": "AGPL-3.0-only",
     "maintainer": {
         "name": "datatierce",
         "email": "github@computhings.be",
         "url": "https://computhings.be"
     },
     "requirements": {
-        "yunohost": ">= 3.8"
+        "yunohost": ">= 4.0.0"
     },
     "multi_instance": false,
     "services": [
@@ -40,8 +40,29 @@
                     "en": "Choose a path for Noalyss",
                     "fr": "Choisissez un chemin pour Noalyss"
                 },
-                "example": "/compta",
-                "default": "/compta"
+                "example": "/noalyss",
+                "default": "/noalyss"
+            },
+            {
+                "name": "admin",
+                "type": "user",
+                "ask": {
+                    "en": "Choose the Mantis administrator",
+                    "fr": "Choisissez l’administrateur de Mantis"
+                }
+            },
+                        {
+                "name": "password",
+                "type": "password",
+                "ask": {
+                    "en": "Set the administrator password",
+                    "fr": "Définissez le mot de passe administrateur"
+                },
+                "help": {
+                    "en": "Use the help field to add an information for the admin about this question.",
+                    "fr": "Utilisez le champ aide pour ajouter une information à l'intention de l'administrateur à propos de cette question."
+                },
+                "example": "Choose a password"
             },
             {
                 "name": "is_public",
diff --git a/scripts/install b/scripts/install
index 597908c..eb34203 100755
--- a/scripts/install
+++ b/scripts/install
@@ -24,6 +24,8 @@ domain=$YNH_APP_ARG_DOMAIN
 path_url=$YNH_APP_ARG_PATH
 is_public=$YNH_APP_ARG_IS_PUBLIC
 language=$YNH_APP_ARG_LANGUAGE
+password=$YNH_APP_ARG_PASSWORD
+admin=$YNH_APP_ARG_ADMIN
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -50,6 +52,7 @@ ynh_app_setting_set --app=$app --key=domain --value=$domain
 ynh_app_setting_set --app=$app --key=path --value=$path_url
 ynh_app_setting_set --app=$app --key=is_public --value=$is_public
 ynh_app_setting_set --app=$app --key=language --value=$language
+ynh_app_setting_set --app=$app --key=admin --value=$admin
 
 #=================================================
 # STANDARD MODIFICATIONS
@@ -143,6 +146,8 @@ cp ../conf/noalyss.conf $final_path/include/config.inc.php
 
 ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$final_path/include/config.inc.php"
 ynh_replace_string --match_string="__DB_PASS__" --replace_string="$db_pwd" --target_file="$final_path/include/config.inc.php"
+ynh_replace_string --match_string="__ADMIN__" --replace_string="$admin" --target_file="$final_path/include/config.inc.php"
+ynh_replace_string --match_string="__PASSWORD__" --replace_string="$password" --target_file="$final_path/include/config.inc.php"
 
 #=================================================
 # STORE THE CONFIG FILE CHECKSUM