From c59eb4ffc1da64333075af9d89a620cb9a037cae Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Sun, 25 Sep 2016 21:24:53 +0200 Subject: [REF] packaging: renamed configuration files no fallbacks were implemented to `openerp-server.conf`. --- setup/win32/setup.nsi | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'setup/win32') 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' -- cgit v1.2.3