From: Daniel Baumann <daniel@debian.org>
Date: Mon, 24 Aug 2009 18:02:04 +0000 (+0300)
Subject: Using more common directory name to store local debian additions.
X-Git-Tag: 6.0.0-rc1-addons~2025^2~5^2~8^2~11^2~6^2~21
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=d7dae818d1531afe3e10f6d28fb37a910f32453b;p=odoo%2Fodoo.git

Using more common directory name to store local debian additions.

bzr revid: p_christ@hol.gr-20090824180204-84p290cqpqtwnhlz
---

diff --git a/debian/config/openerp-server.conf b/debian/config/openerp-server.conf
deleted file mode 100644
index b6891d2..0000000
--- a/debian/config/openerp-server.conf
+++ /dev/null
@@ -1,55 +0,0 @@
-# /etc/openerp-server.conf(5) - configuration file for openerp-server(1)
-
-[options]
-# Enable the debugging mode (default False).
-verbose = False
-debug_mode = False
-
-# The file where the server pid will be stored (default False).
-pidfile = /var/run/openerp.pid
-
-# The file where the server log will be stored (default False).
-logfile = /var/log/openerp.log
-
-# The unix account on behalf openerp is running.
-process_user = openerp
-
-# The IP address on which the server will bind.
-# If empty, it will bind on all interfaces (default empty).
-interface = localhost
-
-# The TCP port on which the server will listen (default 8069).
-port = 8070
-
-# Enable debug mode (default False).
-debug_mode = False
-
-# Launch server over https instead of http (default False).
-secure = False
-
-# Specify the SMTP server for sending email (default localhost).
-smtp_server = localhost
-
-# Specify the SMTP user for sending email (default False).
-smtp_user = False
-
-# Specify the SMTP password for sending email (default False).
-smtp_password = False
-
-# Specify the database name.
-db_name = openerp
-
-# Specify the database user name (default None).
-db_user = openerp
-
-# Specify the database password for db_user (default None).
-db_password =
-
-# Specify the database host (default localhost).
-db_host =
-
-# Specify the database port (default None).
-db_port = 5432
-
-# Specify the price accuracy.
-#price_accuracy =
diff --git a/debian/local/openerp-server.conf b/debian/local/openerp-server.conf
new file mode 100644
index 0000000..b6891d2
--- /dev/null
+++ b/debian/local/openerp-server.conf
@@ -0,0 +1,55 @@
+# /etc/openerp-server.conf(5) - configuration file for openerp-server(1)
+
+[options]
+# Enable the debugging mode (default False).
+verbose = False
+debug_mode = False
+
+# The file where the server pid will be stored (default False).
+pidfile = /var/run/openerp.pid
+
+# The file where the server log will be stored (default False).
+logfile = /var/log/openerp.log
+
+# The unix account on behalf openerp is running.
+process_user = openerp
+
+# The IP address on which the server will bind.
+# If empty, it will bind on all interfaces (default empty).
+interface = localhost
+
+# The TCP port on which the server will listen (default 8069).
+port = 8070
+
+# Enable debug mode (default False).
+debug_mode = False
+
+# Launch server over https instead of http (default False).
+secure = False
+
+# Specify the SMTP server for sending email (default localhost).
+smtp_server = localhost
+
+# Specify the SMTP user for sending email (default False).
+smtp_user = False
+
+# Specify the SMTP password for sending email (default False).
+smtp_password = False
+
+# Specify the database name.
+db_name = openerp
+
+# Specify the database user name (default None).
+db_user = openerp
+
+# Specify the database password for db_user (default None).
+db_password =
+
+# Specify the database host (default localhost).
+db_host =
+
+# Specify the database port (default None).
+db_port = 5432
+
+# Specify the price accuracy.
+#price_accuracy =
diff --git a/debian/openerp-server.install b/debian/openerp-server.install
index 28c56bc..ccfbbb2 100644
--- a/debian/openerp-server.install
+++ b/debian/openerp-server.install
@@ -1 +1 @@
-debian/config/*	/etc/
+debian/local/openerp-server.conf	/etc