Rework conf for Traefik v2.2

templates/prod.yaml.j2

 version: "2.1"
 services:
     odoo:
-        image: filament/odoo
+        image: filament/odoo:{{ odoo_version }}
         container_name: odoo
         depends_on:
             - db
@@ -23,36 +23,17 @@ services:
 {% endif %}
         restart: unless-stopped
         labels:
-            traefik.docker.network: "inverseproxy_shared"
             traefik.enable: "true"
-            traefik.http.routers.odoo-unsec.entrypoints: "http"
-            traefik.http.routers.odoo-unsec.middlewares: "https-redirect@file"
-            traefik.http.routers.odoo-unsec.rule: "Host(`{{ odoo_url }}`{% if odoo_url2 is defined %}, `{{ odoo_url2 }}`{% endif %})"
-            traefik.http.routers.odoo-unsec.service: "odoo"
 {% if ansible_processor_vcpus > 2 %}
-            traefik.http.routers.odoo-longpolling.entrypoints: "https"
-            traefik.http.routers.odoo-longpolling.middlewares: "security-headers@file"
-            traefik.http.routers.odoo-longpolling.rule: "Host(`{{ odoo_url }}`{% if odoo_url2 is defined %}, `{{ odoo_url2 }}`{% endif %})" && PathPrefix(`/longpolling/`)"
+            traefik.http.routers.odoo-longpolling.rule: "Host(`{{ odoo_url }}`{% if odoo_url2 is defined %}, `{{ odoo_url2 }}`{% endif %}) && PathPrefix(`/longpolling/`)"
             traefik.http.routers.odoo-longpolling.service: "odoo-longpolling"
-            traefik.http.routers.odoo-longpolling.tls: "true"
-            traefik.http.routers.odoo-longpolling.tls.certresolver: "le"
-            traefik.http.routers.odoo-longpolling.tls.options: "default@file"
             traefik.http.services.odoo-longpolling.loadbalancer.server.port: "8072"
 {% endif %}
-            traefik.http.routers.odoo-restrict.entrypoints: "https"
-            traefik.http.routers.odoo-restrict.middlewares: "security-headers@file, auth@file"
-            traefik.http.routers.odoo-restrict.rule: "Host(`{{ odoo_url }}`{% if odoo_url2 is defined %}, `{{ odoo_url2 }}`{% endif %})" && (PathPrefix(`/web/database/`) || Path(`/website/info`))"
+            traefik.http.routers.odoo-restrict.middlewares: "auth@file"
+            traefik.http.routers.odoo-restrict.rule: "Host(`{{ odoo_url }}`{% if odoo_url2 is defined %}, `{{ odoo_url2 }}`{% endif %}) && (PathPrefix(`/web/database/`) || Path(`/website/info`))"
             traefik.http.routers.odoo-restrict.service: "odoo"
-            traefik.http.routers.odoo-restrict.tls: "true"
-            traefik.http.routers.odoo-restrict.tls.certresolver: "le"
-            traefik.http.routers.odoo-restrict.tls.options: "default@file"
-            traefik.http.routers.odoo.entrypoints: "https"
-            traefik.http.routers.odoo.middlewares: "security-headers@file"
             traefik.http.routers.odoo.rule: "Host(`{{ odoo_url }}`{% if odoo_url2 is defined %}, `{{ odoo_url2 }}`{% endif %})"
             traefik.http.routers.odoo.service: "odoo"
-            traefik.http.routers.odoo.tls: "true"
-            traefik.http.routers.odoo.tls.certresolver: "le"
-            traefik.http.routers.odoo.tls.options: "default@file"
             traefik.http.services.odoo.loadbalancer.server.port: "8069"
 
     db:

templates/test.yaml.j2

@@ -3,7 +3,7 @@ services:
     odoo:
         build:
             context: ./odoo
-        image: filament/odoo
+        image: filament/odoo:{{ odoo_image_tag | default(odoo_version) }}
         container_name: testodoo
         depends_on:
             - db
@@ -19,36 +19,18 @@ services:
             whitelists_proxy:
         restart: unless-stopped
         labels:
-            traefik.docker.network: "inverseproxy_shared"
             traefik.enable: "true"
-            traefik.http.routers.odootest-unsec.entrypoints: "http"
-            traefik.http.routers.odootest-unsec.middlewares: "https-redirect@file"
-            traefik.http.routers.odootest-unsec.rule: "Host(`{{ odoo_test_url }}`)"
-            traefik.http.routers.odootest-unsec.service: "odootest"
 {% if ansible_processor_vcpus > 2 %}
-            traefik.http.routers.odootest-longpolling.entrypoints: "https"
-            traefik.http.routers.odootest-longpolling.middlewares: "security-headers@file"
             traefik.http.routers.odootest-longpolling.rule: "Host(`{{ odoo_test_url }}`) && PathPrefix(`/longpolling/`)"
             traefik.http.routers.odootest-longpolling.service: "odootest-longpolling"
-            traefik.http.routers.odootest-longpolling.tls: "true"
-            traefik.http.routers.odootest-longpolling.tls.certresolver: "le"
-            traefik.http.routers.odootest-longpolling.tls.options: "default@file"
             traefik.http.services.odootest-longpolling.loadbalancer.server.port: "8072"
 {% endif %}
-            traefik.http.routers.odootest-restrict.entrypoints: "https"
-            traefik.http.routers.odootest-restrict.middlewares: "security-headers@file, auth@file"
+            traefik.http.routers.odootest-restrict.middlewares: "auth@file"
             traefik.http.routers.odootest-restrict.rule: "Host(`{{ odoo_test_url }}`) && (PathPrefix(`/web/database/`) || Path(`/website/info`))"
             traefik.http.routers.odootest-restrict.service: "odootest"
-            traefik.http.routers.odootest-restrict.tls: "true"
-            traefik.http.routers.odootest-restrict.tls.certresolver: "le"
-            traefik.http.routers.odootest-restrict.tls.options: "default@file"
-            traefik.http.routers.odootest.entrypoints: "https"
-            traefik.http.routers.odootest.middlewares: "security-headers@file, norobot-headers@file"
+            traefik.http.routers.odootest.middlewares: "norobot-headers@file"
             traefik.http.routers.odootest.rule: "Host(`{{ odoo_test_url }}`)"
             traefik.http.routers.odootest.service: "odootest"
-            traefik.http.routers.odootest.tls: "true"
-            traefik.http.routers.odootest.tls.certresolver: "le"
-            traefik.http.routers.odootest.tls.options: "default@file"
             traefik.http.services.odootest.loadbalancer.server.port: "8069"
         command:
             - odoo
@@ -79,13 +61,9 @@ services:
         labels:
             traefik.docker.network: "inverseproxy_smtp"
             traefik.enable: "true"
-            traefik.http.routers.odootestsmtp.entrypoints: "https"
-            traefik.http.routers.odootestsmtp.middlewares: "security-headers@file, auth@file, smtp-stripprefix@file"
+            traefik.http.routers.odootestsmtp.middlewares: "auth@file, smtp-stripprefix@file"
             traefik.http.routers.odootestsmtp.rule: "Host(`{{ odoo_test_url }}`) && PathPrefix(`/smtp/`)"
             traefik.http.routers.odootestsmtp.service: "odootestsmtp"
-            traefik.http.routers.odootestsmtp.tls: "true"
-            traefik.http.routers.odootestsmtp.tls.certresolver: "le"
-            traefik.http.routers.odootestsmtp.tls.options: "default@file"
             traefik.http.services.odootestsmtp.loadbalancer.server.port: "8025"
 
 networks: