From 8107638297f0a828bed85b29ad71432511fd8670 Mon Sep 17 00:00:00 2001
From: anmol <github@datamol.org>
Date: Tue, 12 Mar 2019 00:33:01 +0530
Subject: [PATCH] Fix install script

---
 conf/addon.config.php | 11 +++++++++++
 conf/addon.ini.php    | 21 ---------------------
 scripts/install       |  4 ++--
 3 files changed, 13 insertions(+), 23 deletions(-)
 create mode 100644 conf/addon.config.php
 delete mode 100644 conf/addon.ini.php

diff --git a/conf/addon.config.php b/conf/addon.config.php
new file mode 100644
index 0000000..c2800ff
--- /dev/null
+++ b/conf/addon.config.php
@@ -0,0 +1,11 @@
+<?php
+// Addon configuration
+// Copy this configuration file to addon.config.php and edit it if you want to configure addons, see below example for the twitter addon
+return [
+	'ldapauth' => [
+		'ldap_server' => 'localhost',
+		'ldap_searchdn' => 'ou=users,dc=yunohost,dc=org',
+		'ldap_userattr' => 'uid',
+		'ldap_autocreateaccount_emailattribute' => 'mail',
+	],
+];
diff --git a/conf/addon.ini.php b/conf/addon.ini.php
deleted file mode 100644
index 8098cb6..0000000
--- a/conf/addon.ini.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php return <<<INI
-
-; Copy this configuration file to addon.ini.php and edit it if you want to configure addons, see below example for the twitter addon
-
-;[twitter]
-;consumerkey = localhost
-;consumersecret = mysqlusername
-
-[system]
-addon = ldapauth
-
-[ldapauth]
-ldap_server = 'localhost'
-ldap_searchdn = 'ou=users,dc=yunohost,dc=org'
-ldap_userattr = 'uid'
-ldap_autocreateaccount = 'true'
-ldap_autocreateaccount_emailattribute = 'mail'
-
-
-INI;
-// Keep this line
diff --git a/scripts/install b/scripts/install
index 060c1f5..4ac439b 100644
--- a/scripts/install
+++ b/scripts/install
@@ -117,7 +117,7 @@ ynh_replace_string "REGISTER_OPEN" "REGISTER_CLOSED" "$final_path/config/local.c
 ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_name" < "$final_path/database.sql"
 
 # addon config
-sudo  cp  "../conf/addon.ini.php" "$final_path/config/."
+sudo  cp  "../conf/addon.config.php" "$final_path/config/."
 
 #=================================================
 # CREATE DEDICATED USER
@@ -151,7 +151,7 @@ sudo cp ../conf/poller-cron /etc/cron.d/$app
 #=================================================
 
 # Calculate and store the config file checksum into the app settings
-ynh_store_file_checksum "$final_path/config/local.ini.php"
+ynh_store_file_checksum "$final_path/config/local.config.php"
 
 # Run composer 
 (cd $final_path && sudo php bin/composer.phar install)