From 0c49aabfb12feb01f55a0809180fdcafb61e695a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 2 Oct 2023 14:42:33 +0200
Subject: [PATCH] cleaning

---
 conf/conf.php   | 32 ++++++++++++++++++++++++++++++++
 manifest.toml   |  2 +-
 scripts/install | 26 ++++++++++++++------------
 3 files changed, 47 insertions(+), 13 deletions(-)
 create mode 100644 conf/conf.php

diff --git a/conf/conf.php b/conf/conf.php
new file mode 100644
index 0000000..078c040
--- /dev/null
+++ b/conf/conf.php
@@ -0,0 +1,32 @@
+$dolibarr_main_document_root="/home/www/dolibarr/htdocs";
+$dolibarr_main_url_root="http://__DOMAIN____PATH__";
+$dolibarr_main_db_type="mysql";
+$dolibarr_main_db_host="localhost";
+$dolibarr_main_db_port="3306";
+$dolibarr_main_db_name="__DB_NAME__";
+$dolibarr_main_db_user="__DB_USER__";
+$dolibarr_main_db_pass="__DB_PWD__";
+
+
+// Authentication settings
+//$dolibarr_main_authentication='dolibarr';
+
+$dolibarr_main_authentication='ldap,dolibarr';
+
+$dolibarr_main_auth_ldap_host='ldap:localhost';
+
+$dolibarr_main_auth_ldap_port='389';
+
+$dolibarr_main_auth_ldap_version='3';
+
+$dolibarr_main_auth_ldap_servertype='openldap';
+
+$dolibarr_main_auth_ldap_login_attribute='uid';  // Ex: uid or samaccountname for active directory
+
+$dolibarr_main_auth_ldap_dn='ou=users,dc=yunohost,dc=org';
+
+$dolibarr_main_auth_ldap_filter = '&(objectClass=posixAccount)';
+
+//$dolibarr_main_auth_ldap_admin_login='uid=admin,dc=yunohost,dc=org';
+//$dolibarr_main_auth_ldap_admin_pass='secret';
+//$dolibarr_main_auth_ldap_debug='false';
diff --git a/manifest.toml b/manifest.toml
index 0093201..ac4905a 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -48,7 +48,7 @@ ram.runtime = "50M"
 
     [resources.install_dir]
 
-    [resources.data_dir]
+    #[resources.data_dir]
 
     [resources.permissions]
     main.url = "/"
diff --git a/scripts/install b/scripts/install
index d104e8c..a40cabf 100644
--- a/scripts/install
+++ b/scripts/install
@@ -77,7 +77,9 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-ynh_add_config --template="../conf/install.forced.php" --destination="$install_dir/htdocs/install/install.forced.php"
+ynh_add_config --template="../conf/conf.php" --destination="$install_dir/htdocs/conf/conf.php"
+
+#ynh_add_config --template="../conf/install.forced.php" --destination="$install_dir/htdocs/install/install.forced.php"
 
 #=================================================
 # SETUP APPLICATION WITH CURL
@@ -131,26 +133,26 @@ ynh_local_curl "/install/step5.php" \
 
 ynh_exec_fully_quiet sleep 5
 
-ynh_script_progression --message="configuring LDAP" --weight=1
+#ynh_script_progression --message="configuring LDAP" --weight=1
 
-# Populate the LDAP parameters
-ynh_mysql_connect_as --user=$db_name --password=$db_pwd --database=$db_name < ../conf/sql/ldap.sql
+# # Populate the LDAP parameters
+# ynh_mysql_connect_as --user=$db_name --password=$db_pwd --database=$db_name < ../conf/sql/ldap.sql
 
-# Populate the database with YNH users.
-ynh_mysql_connect_as --user=$db_name --password=$db_pwd --database=$db_name < ../conf/sql/ldap_user.sql
+# # Populate the database with YNH users.
+# ynh_mysql_connect_as --user=$db_name --password=$db_pwd --database=$db_name < ../conf/sql/ldap_user.sql
 
-if php$phpversion $install_dir/scripts/user/sync_users_ldap2dolibarr.php commitiferror --server=localhost -y; then
-        ynh_print_info --message="LDAP user update ok"
-else
-        ynh_print_info --message="LDAP user update ended with error"
-fi
+# if php$phpversion $install_dir/scripts/user/sync_users_ldap2dolibarr.php commitiferror --server=localhost -y; then
+#         ynh_print_info --message="LDAP user update ok"
+# else
+#         ynh_print_info --message="LDAP user update ended with error"
+# fi
 
 #=================================================
 # MODIFY A CONFIG FILE
 #=================================================
+ynh_script_progression --message="configuring config file" --weight=1
 
 # Setup HTTP auth in conf
-ynh_script_progression --message="configuring config file" --weight=1
 ynh_replace_string --match_string="dolibarr_main_authentication='dolibarr'" --replace_string="dolibarr_main_authentication='http'" --target_file="$install_dir/htdocs/conf/conf.php"
 
 #=================================================