From 24657490de92fb189bd5760c394819962e9af613 Mon Sep 17 00:00:00 2001
From: scith <scith@hotmail.fr>
Date: Mon, 14 Sep 2015 18:38:24 +0200
Subject: [PATCH] fix

---
 README.md       | 11 +++++++----
 manifest.json   |  7 -------
 scripts/install |  8 +++++---
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index c3770f1..ccaca97 100644
--- a/README.md
+++ b/README.md
@@ -12,14 +12,17 @@ https://example.com/odoo/ will NOT work
 
 What does not work
 ------------------
-Backup and restore
+- Backup and restore
+- Automatic database creation
+- Automatic LDAP configuration
 
 Configuration
 -------------
-Create a database name "subdomain-domain-ltd" (for example "erp-test-com" if you access via erp.test.com)
+**Database**
+- Create a database named "**subdomain-domain-ltd**" (for example "erp-test-com" if you access via erp.test.com)
 
-Setup LDAP
-- Create a user named "template" with email "template". This user will give its permissions by default to YunoHost users so you can also give it appropriate rights.
+**Setup LDAP**
+- Create a user named "template" with email "template". This user will give its permissions by default to YunoHost users so you can also give it appropriate permissions.
 - In "Edit Company Data" (on the logo), go to "Configuration" and add a LDAP setting
 - LDAP Address: localhost
 - LDAP Port: 389
diff --git a/manifest.json b/manifest.json
index cc760f0..ed1c83a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -28,13 +28,6 @@
                 },
                 "choices": ["8.0", "9.0"],
                 "default": "8.0"
-            },
-			{
-                "name": "admin_password",
-                "ask": {
-                    "en": "Choose a strong master admin password",
-					"fr": "Choisissez un mot de passe maître fort pour l'administration"
-                }
             }
         ]
     }
diff --git a/scripts/install b/scripts/install
index 74c8618..0e09591 100644
--- a/scripts/install
+++ b/scripts/install
@@ -36,9 +36,11 @@ sudo yunohost app setting $app domain -v $domain
 		sudo apt-get -y install wkhtmltopdf
 		sudo apt-get -y install odoo
 	
-	# Copy conf file
-		sudo sed -i "s@ADMIN_PASSWORD@$admin_password@g" ../conf/odoo-server.conf
-		sudo cp ../conf/odoo-server.conf /etc/odoo-server.conf
+	# Set admin password
+		sudo sed -i "s@admin_passwd = admin@admin_passwd = $admin_password@g" /etc/odoo/openerp-server.conf
+		
+	# Setup LDAP
+		sudo sed -i "s@'auto_install': False@'auto_install': True@g" /usr/lib/python2.7/dist-packages/openerp/addons/auth_ldap/__openerp__.py
 		
 	# Add services
 		sudo yunohost service add postgresql