From a1e17edb35c2b45bc4e9a42c750e7619a2eb0d8b Mon Sep 17 00:00:00 2001 From: ljf Date: Sun, 16 Dec 2018 23:08:56 +0100 Subject: [PATCH] [fix] Multiinstance --- conf/nginx.conf.j2 | 2 +- conf/server.conf.j2 | 2 ++ sources/patches/11-02-replace-title-bis.patch | 13 +++++++++++++ sources/patches/12-02-replace-title-bis.patch | 13 +++++++++++++ 4 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 sources/patches/11-02-replace-title-bis.patch create mode 100644 sources/patches/12-02-replace-title-bis.patch diff --git a/conf/nginx.conf.j2 b/conf/nginx.conf.j2 index 9700fb2..40ff7ea 100644 --- a/conf/nginx.conf.j2 +++ b/conf/nginx.conf.j2 @@ -20,7 +20,7 @@ location @{{ app }} { proxy_send_timeout 720s; } location /longpolling { - proxy_pass http://127.0.0.1:8072; + proxy_pass http://127.0.0.1:{{ port_chat }}; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-Proto $scheme; diff --git a/conf/server.conf.j2 b/conf/server.conf.j2 index 65721fa..76f96f2 100644 --- a/conf/server.conf.j2 +++ b/conf/server.conf.j2 @@ -12,3 +12,5 @@ dbfilter = ^{{ db_name }}$ logfile = /var/log/{{ app }}.log xmlrpc_interface = 127.0.0.1 netrpc_interface = 127.0.0.1 +xmlrpc_port = {{ port }} +longpolling_port = {{ port_chat }} diff --git a/sources/patches/11-02-replace-title-bis.patch b/sources/patches/11-02-replace-title-bis.patch new file mode 100644 index 0000000..3d9815c --- /dev/null +++ b/sources/patches/11-02-replace-title-bis.patch @@ -0,0 +1,13 @@ +diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml +index 5fa62beb761..124ab72d45a 100644 +--- a/addons/web/views/webclient_templates.xml ++++ b/addons/web/views/webclient_templates.xml +@@ -253,7 +253,7 @@ + + + +- ++ <title t-esc="title or 'LibreERP'"/> + <link type="image/x-icon" rel="shortcut icon" t-att-href="x_icon or '/web/static/src/img/favicon.ico'"/> + + <script type="text/javascript"> diff --git a/sources/patches/12-02-replace-title-bis.patch b/sources/patches/12-02-replace-title-bis.patch new file mode 100644 index 0000000..f4f4b69 --- /dev/null +++ b/sources/patches/12-02-replace-title-bis.patch @@ -0,0 +1,13 @@ +diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml +index cb1184e3565..2b921b9c6d9 100644 +--- a/addons/web/views/webclient_templates.xml ++++ b/addons/web/views/webclient_templates.xml +@@ -331,7 +331,7 @@ + <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/> + <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"/> + +- <title t-esc="title or 'Odoo'"/> ++ <title t-esc="title or 'LibreERP'"/> + <link type="image/x-icon" rel="shortcut icon" t-att-href="x_icon or '/web/static/src/img/favicon.ico'"/> + + <script type="text/javascript">