fix test

netr0m · Oct 25, 2023 · fc6facd · fc6facd
1 parent 34239a1
commit fc6facd
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 22 deletions.
diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
@@ -43,9 +43,6 @@ jobs:
       - name: 'Install dependencies'
         run: pip3 install ansible molecule molecule-plugins[docker] docker requests
 
-      - name: 'List packages'
-        run: pip3 freeze
-
       - name: 'Run molecule tests'
         run: |
           cd ${{ inputs.dirname }}

diff --git a/README.md b/README.md
@@ -56,12 +56,12 @@ svc_traefik_acme_settings:
 #### Extending Traefik
 
 ##### Adding additional middlewares
-*See default middlewares in [vars/main.yml](vars/main.yml) under `svc_traefik_middlewares_default`.*
+*See default middlewares in [vars/main.yml](vars/main.yml) under `svc_traefik_default_middlewares`.*
 
 See the [Traefik Docs on HTTP Middlewares](https://doc.traefik.io/traefik/middlewares/http/overview/#available-http-middlewares) for details.
 
 ```yml
-svc_traefik_middlewares:
+svc_traefik_extra_middlewares:
   my-custom-mwr:
     headers:
       customRequestHeaders:
@@ -71,6 +71,17 @@ svc_traefik_middlewares:
       prefix: "/api"
 ```
 
+##### Adding additional entryPoints
+*See default entryPoints in [traefik.yml.j2](templates/etc/traefik/traefik.yml.j2)*
+
+```yml
+svc_traefik_extra_entrypoints:
+  - name: dns
+    port: 53
+  - name: dnsUdp
+    port: 53/udp
+```
+
 ##### Adding additional hosts without using Docker container labels (also applies to non-Docker hosts and services on remote hosts)
 ```yml
 svc_traefik_extra_hosts:

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -41,7 +41,6 @@ svc_packages: []
 # Pip packages to install
 svc_packages_pip:
   - 'docker'
-  - 'requests'
 
 ### Services ###
 # Default restart policy
@@ -115,17 +114,22 @@ svc_traefik_extra_hosts: []
   #   protocol: https
   #   ip_addr: 10.10.10.10
   #   port: 8080
-# Extra middlewares for Traefik. See templates/etc/traefik/config/http.yml
-svc_traefik_middlewares: {}
+# Extra middlewares for Traefik. See templates/etc/traefik/config/http.yml.j2
+svc_traefik_extra_middlewares: {}
   # example-mwr:
   #   headers:
   #     customRequestHeaders:
   #       Authorization: ''
   #       X-Forwarded-Proto: 'https'
-
-# Extra certificates for Traefik. See templates/etc/traefik/traefik.yml
+# Extra entrypoints for Traefik. See templates/etc/traefik/traefik.yml.j2
+svc_traefik_extra_entrypoints: []
+  # - name: dns
+  #   port: 53
+  # - name: dnsUdp
+  #   port: 53/udp
+# Extra certificates for Traefik. See templates/etc/traefik/traefik.yml.j2
 # First entry in the list will be used as the default, if any
-svc_traefik_certificates: []
+svc_traefik_extra_certificates: []
   # - crt: /etc/traefik/tls/domain.tld.crt
   #   key: /etc/traefik/tls/domain.tld.key
 

diff --git a/docs/default-variables.md b/docs/default-variables.md
@@ -222,21 +222,30 @@ svc_traefik_extra_hosts: []
   #   ip_addr: 10.10.10.10
   #   port: 8080
 ```
-### Extra middlewares for Traefik. See templates/etc/traefik/config/http.yml
+### Extra middlewares for Traefik. See templates/etc/traefik/config/http.yml.j2
 
 ```yaml
-svc_traefik_middlewares: {}
+svc_traefik_extra_middlewares: {}
   # example-mwr:
   #   headers:
   #     customRequestHeaders:
   #       Authorization: ''
   #       X-Forwarded-Proto: 'https'
 ```
-### Extra certificates for Traefik. See templates/etc/traefik/traefik.yml
+### Extra entrypoints for Traefik. See templates/etc/traefik/traefik.yml.j2
+
+```yaml
+svc_traefik_extra_entrypoints: []
+  # - name: dns
+  #   port: 53
+  # - name: dnsUdp
+  #   port: 53/udp
+```
+### Extra certificates for Traefik. See templates/etc/traefik/traefik.yml.j2
 First entry in the list will be used as the default, if any
 
 ```yaml
-svc_traefik_certificates: []
+svc_traefik_extra_certificates: []
   # - crt: /etc/traefik/tls/domain.tld.crt
   #   key: /etc/traefik/tls/domain.tld.key
 ```

diff --git a/templates/etc/traefik/config/http.yml.j2 b/templates/etc/traefik/config/http.yml.j2
@@ -16,7 +16,7 @@ http:
               - "*.{{ svc_domain }}"
 
 {% endfor %}
-  middlewares: {{ svc_traefik_middlewares_default | combine(svc_traefik_middlewares | default({})) | combine(svc_traefik_middlewares_extra | default({})) }}
+  middlewares: {{ svc_traefik_default_middlewares | combine(svc_traefik_extra_middlewares | default({})) }}
 
   services:
   {% for service in svc_traefik_extra_hosts %}

diff --git a/templates/etc/traefik/traefik.yml.j2 b/templates/etc/traefik/traefik.yml.j2
@@ -74,16 +74,16 @@ certificatesResolvers:
           - 1.1.1.1:53
           - 1.0.0.1:53
 {% endif %}
-{% if svc_traefik_certificates | length > 0 %}
+{% if svc_traefik_extra_certificates | length > 0 %}
 tls:
   stores:
     default:
       defaultCertificate:
-        certFile: {{ svc_traefik_certificates[0].crt }}
-        keyFile: {{ svc_traefik_certificates[0].key }}
-  {% if svc_traefik_certificates | length > 1 %}
+        certFile: {{ svc_traefik_extra_certificates[0].crt }}
+        keyFile: {{ svc_traefik_extra_certificates[0].key }}
+  {% if svc_traefik_extra_certificates | length > 1 %}
   certificates:
-  {% for certificate in svc_traefik_certificates %}
+  {% for certificate in svc_traefik_extra_certificates %}
     - certFile: {{ certificate.crt }}
       keyFile: {{ certificate.key }}
   {% endfor %}

diff --git a/vars/main.yml b/vars/main.yml
@@ -6,7 +6,7 @@ svc_docker_network_name: "svc_net"
 svc_traefik_letsencrypt_staging_server: https://acme-staging-v02.api.letsencrypt.org/directory
 
 # Default middlewares for traefik
-svc_traefik_middlewares_default:
+svc_traefik_default_middlewares:
   lan-mwr:
     ipWhiteList:
       sourceRange: