testing

dev/dockerbox.yml

@@ -7,7 +7,8 @@
     - base
     - docker
     - traefik
-    - nextcloud
+#    - nextcloud
-    - jenkins
+#    - gitea
-    - prometheus
+#    - jenkins
-    - nginx
+#    - prometheus
+#    - nginx

dev/host_vars/dockerbox.yml

@@ -13,7 +13,6 @@ traefik_domain: traefik.vm.krislamo.org
 traefik_auth: admin:$apr1$T1l.BCFz$Jyg8msXYEAUi3LLH39I9d1 # admin:admin
 #traefik_acme_email: realemail@example.com # Let's Encrypt settings
 #traefik_production: true
-traefik_http_only: true # if behind reverse-proxy
 
 # nextcloud
 nextcloud_version: stable

roles/traefik/defaults/main.yml

@@ -1,18 +1,16 @@
-# Container settings
+# container settings
 traefik_name: traefik
 traefik_standalone: true
-traefik_http_only: false
 traefik_debug: false
 traefik_web_entry: "80:80"
 traefik_websecure_entry: "443:443"
-traefik_localonly: "10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16, 127.0.0.0/8"
 
-# HTTPS settings
+# review these options before pushing (if i can remember)
 traefik_production: false
 traefik_hsts_enable: false
 traefik_hsts_preload: false
 traefik_hsts_seconds: 0
-traefik_http_redirect: true
+traefik_http_redirect: false
 
-# Host settings
+# host
 traefik_root: "{{ docker_compose_root }}/{{ traefik_name }}"

roles/traefik/templates/compose-env.j2

@@ -1,7 +1,7 @@
 # {{ ansible_managed }}
 traefik_version={{ traefik_version }}
 traefik_name={{ traefik_name }}
-traefik_domain={{ traefik_domain }}
+traefik_domain={{ gitea_domain }}
 traefik_dashboard={{ traefik_dashboard | string | lower }}
 traefik_debug={{ traefik_debug | string | lower }}
 traefik_web_entry={{ traefik_web_entry }}

roles/traefik/templates/docker-compose.yml.j2

@@ -8,9 +8,20 @@ services:
   traefik:
     image: "traefik:${traefik_version}"
     container_name: "${traefik_name}"
+    command:
+      - --api.dashboard=${traefik_dashboard:-false}
+      - --api.debug=${traefik_debug:-false}
+      - --providers.docker=true
+      - --entrypoints.web.address=:80
+{% if traefik_standalone %}
+      - --entrypoints.web.http.redirections.entrypoint.to=websecure
+      - --entrypoints.web.http.redirections.entrypoint.scheme=https
+      - --entrypoints.web.http.redirections.entrypoint.permanent=true
+      - --entrypoints.websecure.address=:443
+{% endif %}
     ports:
       - "${traefik_web_entry:-80:80}"
-{% if traefik_standalone and not traefik_http_only %}
+{% if traefik_standalone %}
       - "${traefik_websecure_entry:-443:443}"
 {% endif %}
     networks:
@@ -18,6 +29,12 @@ services:
     labels:
       - "traefik.http.routers.traefik.rule=Host(`{{ traefik_domain }}`)"
       - "traefik.http.routers.traefik.service=api@internal"
+{% if traefik_standalone %}
+      - "traefik.http.routers.traefik.entrypoints=websecure"
+      - "traefik.http.routers.traefik.tls=true"
+{% else %}
+      - "traefik.http.routers.traefik.entrypoints=web"
+{% endif %}
       - "traefik.docker.network=traefik"
       - "traefik.enable=${traefik_dashboard:-false}"
     volumes:

roles/traefik/templates/traefik.yml.j2

@@ -10,7 +10,7 @@ providers:
 entrypoints:
   web:
     address: ':80'
-{% if traefik_http_redirect is defined and traefik_http_redirect and not traefik_http_only %}
+{% if traefik_http_redirect is defined and traefik_http_redirect %}
     http:
       redirections:
         entrypoint:
@@ -18,12 +18,10 @@ entrypoints:
           scheme: https
           permanent: true
 {% endif %}
-{% if not traefik_http_only is defined or not traefik_http_only %}
   websecure:
     address: ':443'
     http:
       tls: {}
-{% endif %}
 
 {% if traefik_acme_email is defined %}
 certificatesResolvers: