From 4a4b0d399f6901ec9d8411b4e26924c6abb2c375 Mon Sep 17 00:00:00 2001
From: scith <scith@hotmail.fr>
Date: Mon, 14 Sep 2015 18:56:06 +0200
Subject: [PATCH] fix

---
 conf/{odoo-server.conf => openerp-server.conf} | 8 ++------
 scripts/install                                | 4 +++-
 2 files changed, 5 insertions(+), 7 deletions(-)
 rename conf/{odoo-server.conf => openerp-server.conf} (57%)

diff --git a/conf/odoo-server.conf b/conf/openerp-server.conf
similarity index 57%
rename from conf/odoo-server.conf
rename to conf/openerp-server.conf
index 9d06105..4da9613 100644
--- a/conf/odoo-server.conf
+++ b/conf/openerp-server.conf
@@ -5,10 +5,6 @@ db_host = False
 db_port = False
 db_user = odoo
 db_password = False
-addons_path = /opt/odoo/addons
-;Log settings
-logfile = /var/log/odoo/odoo-server.log
-log_level = error 
+addons_path = /usr/lib/python2.7/dist-packages/openerp/addons
 proxy_mode = true
-dbfilter = %h
-init = auth_ldap
\ No newline at end of file
+dbfilter = %h
\ No newline at end of file
diff --git a/scripts/install b/scripts/install
index 0e09591..5c18f50 100644
--- a/scripts/install
+++ b/scripts/install
@@ -37,7 +37,9 @@ sudo yunohost app setting $app domain -v $domain
 		sudo apt-get -y install odoo
 	
 	# Set admin password
-		sudo sed -i "s@admin_passwd = admin@admin_passwd = $admin_password@g" /etc/odoo/openerp-server.conf
+		sudo sed -i "s@admin_passwd = admin@admin_passwd = $admin_password@g" ../conf/openerp-server.conf
+		sudo cp ../conf/openerp-server.conf /etc/odoo/openerp-server.conf
+		sudo chown odoo:odoo /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