From c59eb4ffc1da64333075af9d89a620cb9a037cae Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Sun, 25 Sep 2016 21:24:53 +0200
Subject: [REF] packaging: renamed configuration files

no fallbacks were implemented to `openerp-server.conf`.
---
 debian/init                | 2 +-
 debian/install             | 2 +-
 debian/odoo.conf           | 8 ++++++++
 debian/openerp-server.conf | 8 --------
 debian/postinst            | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 debian/odoo.conf
 delete mode 100644 debian/openerp-server.conf

(limited to 'debian')

diff --git a/debian/init b/debian/init
index 41cfe2725bc..a5dc4af7020 100644
--- a/debian/init
+++ b/debian/init
@@ -17,7 +17,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin
 DAEMON=/usr/bin/odoo
 NAME=odoo
 DESC=odoo
-CONFIG=/etc/odoo/openerp-server.conf
+CONFIG=/etc/odoo/odoo.conf
 LOGFILE=/var/log/odoo/odoo-server.log
 PIDFILE=/var/run/${NAME}.pid
 USER=odoo
diff --git a/debian/install b/debian/install
index e984a257b08..cd55a16c6ed 100644
--- a/debian/install
+++ b/debian/install
@@ -1,2 +1,2 @@
-debian/openerp-server.conf /etc/odoo
+debian/odoo.conf /etc/odoo
 README.md /usr/share/doc/odoo
diff --git a/debian/odoo.conf b/debian/odoo.conf
new file mode 100644
index 00000000000..b4abc443124
--- /dev/null
+++ b/debian/odoo.conf
@@ -0,0 +1,8 @@
+[options]
+; This is the password that allows database operations:
+; admin_passwd = admin
+db_host = False
+db_port = False
+db_user = odoo
+db_password = False
+addons_path = /usr/lib/python2.7/dist-packages/odoo/addons
diff --git a/debian/openerp-server.conf b/debian/openerp-server.conf
deleted file mode 100644
index b4abc443124..00000000000
--- a/debian/openerp-server.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-[options]
-; This is the password that allows database operations:
-; admin_passwd = admin
-db_host = False
-db_port = False
-db_user = odoo
-db_password = False
-addons_path = /usr/lib/python2.7/dist-packages/odoo/addons
diff --git a/debian/postinst b/debian/postinst
index 5a33cc158df..342fa4e159e 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -2,7 +2,7 @@
 
 set -e
 
-ODOO_CONFIGURATION_FILE=/etc/odoo/openerp-server.conf
+ODOO_CONFIGURATION_FILE=/etc/odoo/odoo.conf
 ODOO_GROUP="odoo"
 ODOO_DATA_DIR=/var/lib/odoo
 ODOO_LOG_DIR=/var/log/odoo
-- 
cgit v1.2.3