Skip to content
Extraits de code Groupes Projets
Valider 2a39d203 rédigé par Rémi - Le Filament's avatar Rémi - Le Filament
Parcourir les fichiers

[ADD] parameter websocket_uri (changed in v16)

parent 1da6a1fb
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -4,7 +4,10 @@ ...@@ -4,7 +4,10 @@
## Odoo PostgreSQL version ## Odoo PostgreSQL version
odoo_db_version: '13' odoo_db_version: '13'
## Odoo version ## Odoo version
odoo_version: '14.0' odoo_version: '16.0'
## Odoo websocket URI (websocket from 16.0 onwards, longpolling before)
websocket_uri: 'websocket'
## Custom modules default URL for retrieving custom modules : ## Custom modules default URL for retrieving custom modules :
custom_modules_base_url: "https://sources.le-filament.com/lefilament" custom_modules_base_url: "https://sources.le-filament.com/lefilament"
......
...@@ -46,9 +46,9 @@ services: ...@@ -46,9 +46,9 @@ services:
co.elastic.logs/multiline.match: "after" co.elastic.logs/multiline.match: "after"
traefik.enable: "true" traefik.enable: "true"
{% if ansible_processor_vcpus > 2 or odoo_prod.force_odoo_workers is defined %} {% if ansible_processor_vcpus > 2 or odoo_prod.force_odoo_workers is defined %}
traefik.http.routers.odoo-longpolling.rule: "Host(`{{ odoo_prod.url }}`{% if odoo_prod.url2 is defined %}, `{{ odoo_prod.url2 }}`{% endif %}) && PathPrefix(`/longpolling/`)" traefik.http.routers.odoo-{{ websocket_uri }}.rule: "Host(`{{ odoo_prod.url }}`{% if odoo_prod.url2 is defined %}, `{{ odoo_prod.url2 }}`{% endif %}) && PathPrefix(`/{{ websocket_uri }}/`)"
traefik.http.routers.odoo-longpolling.service: "odoo-longpolling" traefik.http.routers.odoo-{{ websocket_uri }}.service: "odoo-{{ websocket_uri }}"
traefik.http.services.odoo-longpolling.loadbalancer.server.port: "8072" traefik.http.services.odoo-{{ websocket_uri }}.loadbalancer.server.port: "8072"
{% endif %} {% endif %}
traefik.http.routers.odoo-restrict.middlewares: "auth@file" traefik.http.routers.odoo-restrict.middlewares: "auth@file"
traefik.http.routers.odoo-restrict.rule: "Host(`{{ odoo_prod.url }}`{% if odoo_prod.url2 is defined %}, `{{ odoo_prod.url2 }}`{% endif %}) && Path(`/website/info`, `/web/database/{p:manager|create|duplicate|drop|backup|restore|change_password}`)" traefik.http.routers.odoo-restrict.rule: "Host(`{{ odoo_prod.url }}`{% if odoo_prod.url2 is defined %}, `{{ odoo_prod.url2 }}`{% endif %}) && Path(`/website/info`, `/web/database/{p:manager|create|duplicate|drop|backup|restore|change_password}`)"
......
...@@ -36,9 +36,9 @@ services: ...@@ -36,9 +36,9 @@ services:
co.elastic.logs/enabled: "false" co.elastic.logs/enabled: "false"
traefik.enable: "true" traefik.enable: "true"
{% if ansible_processor_vcpus > 2 or item.force_odoo_workers is defined %} {% if ansible_processor_vcpus > 2 or item.force_odoo_workers is defined %}
traefik.http.routers.{{ item.dir }}-longpolling.rule: "Host(`{{ item.url }}`) && PathPrefix(`/longpolling/`)" traefik.http.routers.{{ item.dir }}-{{ websocket_uri }}.rule: "Host(`{{ item.url }}`) && PathPrefix(`/{{ websocket_uri }}/`)"
traefik.http.routers.{{ item.dir }}-longpolling.service: "{{ item.dir }}-longpolling" traefik.http.routers.{{ item.dir }}-{{ websocket_uri }}.service: "{{ item.dir }}-{{ websocket_uri }}"
traefik.http.services.{{ item.dir }}-longpolling.loadbalancer.server.port: "8072" traefik.http.services.{{ item.dir }}-{{ websocket_uri }}.loadbalancer.server.port: "8072"
{% endif %} {% endif %}
traefik.http.routers.{{ item.dir }}-restrict.middlewares: "auth@file" traefik.http.routers.{{ item.dir }}-restrict.middlewares: "auth@file"
traefik.http.routers.{{ item.dir }}-restrict.rule: "Host(`{{ item.url }}`) && Path(`/website/info`, `/web/database/{p:manager|create|duplicate|drop|backup|restore|change_password}`)" traefik.http.routers.{{ item.dir }}-restrict.rule: "Host(`{{ item.url }}`) && Path(`/website/info`, `/web/database/{p:manager|create|duplicate|drop|backup|restore|change_password}`)"
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter