diff options
| -rw-r--r-- | debian/init | 2 | ||||
| -rw-r--r-- | debian/install | 2 | ||||
| -rw-r--r-- | debian/odoo.conf (renamed from debian/openerp-server.conf) | 0 | ||||
| -rw-r--r-- | debian/postinst | 2 | ||||
| -rw-r--r-- | doc/setup/install.rst | 6 | ||||
| -rw-r--r-- | odoo/tools/config.py | 2 | ||||
| -rwxr-xr-x | setup/package.py | 8 | ||||
| -rw-r--r-- | setup/redhat/postinstall.sh | 2 | ||||
| -rwxr-xr-x | setup/win32/setup.nsi | 14 |
9 files changed, 19 insertions, 19 deletions
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/openerp-server.conf b/debian/odoo.conf index b4abc443124..b4abc443124 100644 --- a/debian/openerp-server.conf +++ b/debian/odoo.conf 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 diff --git a/doc/setup/install.rst b/doc/setup/install.rst index 3e5940d8ba1..31f19d07e2f 100644 --- a/doc/setup/install.rst +++ b/doc/setup/install.rst @@ -131,7 +131,7 @@ Configuration ''''''''''''' The :ref:`configuration file <reference/cmdline/config>` can be found at -:file:`{%PROGRAMFILES%}\\Odoo 9.0-{id}\\server\\openerp-server.conf`. +:file:`{%PROGRAMFILES%}\\Odoo 9.0-{id}\\server\\odoo.conf`. The configuration file can be edited to connect to a remote Postgresql, edit file locations or set a dbfilter. @@ -192,7 +192,7 @@ Configuration ''''''''''''' The :ref:`configuration file <reference/cmdline/config>` can be found at -:file:`/etc/odoo/openerp-server.conf` +:file:`/etc/odoo/odoo.conf` When the configuration file is edited, Odoo must be restarted using ``service``: @@ -259,7 +259,7 @@ Configuration ''''''''''''' The :ref:`configuration file <reference/cmdline/config>` can be found at -:file:`/etc/odoo/openerp-server.conf` +:file:`/etc/odoo/odoo.conf` When the configuration file is edited, Odoo must be restarted via SystemD: diff --git a/odoo/tools/config.py b/odoo/tools/config.py index 20105c775ed..583d91e0302 100644 --- a/odoo/tools/config.py +++ b/odoo/tools/config.py @@ -350,7 +350,7 @@ class configmanager(object): # else he won't be able to save the configurations, or even to start the server... # TODO use appdirs if os.name == 'nt': - rcfilepath = os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])), 'openerp-server.conf') + rcfilepath = os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])), 'odoo.conf') else: rcfilepath = os.path.expanduser('~/.openerp_serverrc') diff --git a/setup/package.py b/setup/package.py index 220c655fbec..d5bd0564423 100755 --- a/setup/package.py +++ b/setup/package.py @@ -317,8 +317,8 @@ def test_deb(o): wheezy.system('su postgres -s /bin/bash -c "createdb mycompany"') wheezy.system('/usr/bin/dpkg -i /opt/release/%s' % wheezy.release) wheezy.system('/usr/bin/apt-get install -f -y') - wheezy.system('su odoo -s /bin/bash -c "odoo -c /etc/odoo/openerp-server.conf -d mycompany -i base --stop-after-init"') - wheezy.system('su odoo -s /bin/bash -c "odoo -c /etc/odoo/openerp-server.conf -d mycompany &"') + wheezy.system('su odoo -s /bin/bash -c "odoo -c /etc/odoo/odoo.conf -d mycompany -i base --stop-after-init"') + wheezy.system('su odoo -s /bin/bash -c "odoo -c /etc/odoo/odoo.conf -d mycompany &"') def test_rpm(o): with docker('odoo-%s-fedora-nightly-tests' % version, o.build_dir, o.pub) as fedora24: @@ -329,8 +329,8 @@ def test_rpm(o): fedora24.system('su postgres -c "createdb mycompany"') # Odoo install fedora24.system('dnf install -d 0 -e 0 /opt/release/%s -y' % fedora24.release) - fedora24.system('su odoo -s /bin/bash -c "odoo -c /etc/odoo/openerp-server.conf -d mycompany -i base --stop-after-init"') - fedora24.system('su odoo -s /bin/bash -c "odoo -c /etc/odoo/openerp-server.conf -d mycompany &"') + fedora24.system('su odoo -s /bin/bash -c "odoo -c /etc/odoo/odoo.conf -d mycompany -i base --stop-after-init"') + fedora24.system('su odoo -s /bin/bash -c "odoo -c /etc/odoo/odoo.conf -d mycompany &"') def test_exe(o): KVMWinTestExe(o, o.vm_winxp_image, o.vm_winxp_ssh_key, o.vm_winxp_login).start() diff --git a/setup/redhat/postinstall.sh b/setup/redhat/postinstall.sh index 5261e5f615a..cfc4f754233 100644 --- a/setup/redhat/postinstall.sh +++ b/setup/redhat/postinstall.sh @@ -3,7 +3,7 @@ set -e ODOO_CONFIGURATION_DIR=/etc/odoo -ODOO_CONFIGURATION_FILE=$ODOO_CONFIGURATION_DIR/openerp-server.conf +ODOO_CONFIGURATION_FILE=$ODOO_CONFIGURATION_DIR/odoo.conf ODOO_DATA_DIR=/var/lib/odoo ODOO_GROUP="odoo" ODOO_LOG_DIR=/var/log/odoo diff --git a/setup/win32/setup.nsi b/setup/win32/setup.nsi index c63d460a321..ea81bfd965f 100755 --- a/setup/win32/setup.nsi +++ b/setup/win32/setup.nsi @@ -219,18 +219,18 @@ Section $(TITLE_OpenERP_Server) SectionOpenERP_Server File /r "${STATIC_PATH}\less\*"
# If there is a previous install of the OpenERP Server, keep the login/password from the config file
- WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "db_host" $TextPostgreSQLHostname
- WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "db_user" $TextPostgreSQLUsername
- WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "db_password" $TextPostgreSQLPassword
- WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "db_port" $TextPostgreSQLPort
+ WriteIniStr "$INSTDIR\server\odoo.conf" "options" "db_host" $TextPostgreSQLHostname
+ WriteIniStr "$INSTDIR\server\odoo.conf" "options" "db_user" $TextPostgreSQLUsername
+ WriteIniStr "$INSTDIR\server\odoo.conf" "options" "db_password" $TextPostgreSQLPassword
+ WriteIniStr "$INSTDIR\server\odoo.conf" "options" "db_port" $TextPostgreSQLPort
# Fix the addons path
- WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "addons_path" "$INSTDIR\server\odoo\addons"
- WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "bin_path" "$INSTDIR\thirdparty"
+ WriteIniStr "$INSTDIR\server\odoo.conf" "options" "addons_path" "$INSTDIR\server\odoo\addons"
+ WriteIniStr "$INSTDIR\server\odoo.conf" "options" "bin_path" "$INSTDIR\thirdparty"
# if we're going to install postgresql force it's path,
# otherwise we consider it's always done and/or correctly tune by users
${If} $HasPostgreSQL == 0
- WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "pg_path" "$INSTDIR\PostgreSQL\bin"
+ WriteIniStr "$INSTDIR\server\odoo.conf" "options" "pg_path" "$INSTDIR\PostgreSQL\bin"
${EndIf}
nsExec::Exec '"$INSTDIR\server\odoo-bin.exe" --stop-after-init --logfile "$INSTDIR\server\odoo.log" -s'
|