Merge branch 'develop' into dist/eole/2.7.0/develop

This commit is contained in:
vincent 2019-02-20 15:25:28 +01:00
commit 8e742fc88b
2 changed files with 2 additions and 2 deletions

View File

@ -78,7 +78,7 @@ SCRIPTS_REMOTE_DIR=/var/tmp/one
PORT = 2633 PORT = 2633
%if %%one_ha_role == 'oui' %if %%enable_one_ha == 'oui'
LISTEN_ADDRESS = %%adresse_ip_eth0 LISTEN_ADDRESS = %%adresse_ip_eth0
%else %else
LISTEN_ADDRESS = "127.0.0.1" LISTEN_ADDRESS = "127.0.0.1"

View File

@ -75,7 +75,7 @@
MESSAGE_SIZE = 1073741824 MESSAGE_SIZE = 1073741824
TIMEOUT = 60 TIMEOUT = 60
%if %%one_ha_role == 'oui' %if %%enable_one_ha == 'oui'
ONE_XMLRPC = "http://%%adresse_ip_eth0:2633/RPC2" ONE_XMLRPC = "http://%%adresse_ip_eth0:2633/RPC2"
%else %else
ONE_XMLRPC = "http://localhost:2633/RPC2" ONE_XMLRPC = "http://localhost:2633/RPC2"