From cb0e40d74fe6c7c4ee2deef7089af4ab42423f77 Mon Sep 17 00:00:00 2001
From: Yhael S <yhaelopez@gmail.com>
Date: Tue, 29 Aug 2023 03:22:11 -0500
Subject: [PATCH] changed /longpolling url to /websocket and longpolling_port
 to gevent_port

---
 .env.example           | 6 +++---
 nginx/default.conf     | 4 ++--
 odoo/odoo.example.conf | 5 +++--
 odoo/odoorc.sh         | 7 ++++---
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.env.example b/.env.example
index da2d250..74139a6 100644
--- a/.env.example
+++ b/.env.example
@@ -6,7 +6,7 @@ APP_ENV=local
 INIT=
 UPDATE=
 LOAD=base,web
-WORKERS=0
+WORKERS=2
 DEV_MODE=reload,qweb
 DOMAIN=erp.odoocker.test
 
@@ -64,7 +64,7 @@ PROJECT_NAME=odoocker
 SUPPORT_EMAIL=mail@example.com
 
 # Containers' Tags
-ODOO_TAG=15.0
+ODOO_TAG=16.0
 POSTGRES_TAG=15.4
 NGINX_TAG=1.25.2
 NGINX_PROXY_TAG=1.3.1
@@ -113,7 +113,7 @@ DEBUG_INTERFACE=${HTTP_INTERFACE}
 HTTP_PORT=8069
 DEBUG_PORT=8070
 XMLRPCS_PORT=8071
-LONGPOLLING_PORT=8072
+GEVENT_PORT=8072
 HTTP_ENABLE=True
 XMLRPCS=True
 PROXY_MODE=True
diff --git a/nginx/default.conf b/nginx/default.conf
index 97f5929..dcd7604 100644
--- a/nginx/default.conf
+++ b/nginx/default.conf
@@ -47,11 +47,11 @@ server {
         proxy_pass http://odoo:8069;
     }
 
-    location /longpolling {
+    location /websocket {
         proxy_set_header X-Real-IP  $remote_addr;
         proxy_set_header X-Forwarded-For $remote_addr;
         proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header Host $host;
+        proxy_set_header X-Forwarded-Host $host;
         proxy_pass http://odoo:8072;
     }
 }
diff --git a/odoo/odoo.example.conf b/odoo/odoo.example.conf
index 84e2820..30d8ee5 100644
--- a/odoo/odoo.example.conf
+++ b/odoo/odoo.example.conf
@@ -64,8 +64,9 @@ xmlrpcs_interface = {XMLRPCS_INTERFACE}
 ; --xmlrpcs-port
 xmlrpcs_port = {XMLRPCS_PORT}
 
-; --longpolling_port
-longpolling_port = {LONGPOLLING_PORT}
+; --gevent-port | --longpolling_port (deprecated)
+gevent_port = {GEVENT_PORT}
+longpolling_port = False
 
 ; --no-http | --no-xmlrpc
 http_enable = {HTTP_ENABLE}
diff --git a/odoo/odoorc.sh b/odoo/odoorc.sh
index 9b841f2..4358e4f 100755
--- a/odoo/odoorc.sh
+++ b/odoo/odoorc.sh
@@ -35,7 +35,7 @@ defaults=(
     [HTTP_PORT]=${HTTP_PORT}
     [XMLRPCS_INTERFACE]=${XMLRPCS_INTERFACE}
     [XMLRPCS_PORT]=${XMLRPCS_PORT}
-    [LONGPOLLING_PORT]=${LONGPOLLING_PORT}
+    [GEVENT_PORT]=${GEVENT_PORT}
     [HTTP_ENABLE]=${HTTP_ENABLE}
     [XMLRPCS]=${XMLRPCS}
     [PROXY_MODE]=${PROXY_MODE}
@@ -170,8 +170,9 @@ xmlrpcs_interface = {XMLRPCS_INTERFACE}
 ; --xmlrpcs-port
 xmlrpcs_port = {XMLRPCS_PORT}
 
-; --longpolling_port
-longpolling_port = {LONGPOLLING_PORT}
+; --gevent-port | --longpolling_port (deprecated)
+gevent_port = {GEVENT_PORT}
+longpolling_port = False
 
 ; --no-http | --no-xmlrpc
 http_enable = {HTTP_ENABLE}