diff --git a/.idea/digitalboard.core.iml b/.idea/digitalboard.core.iml deleted file mode 100644 index 0f200bc..0000000 --- a/.idea/digitalboard.core.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 03d9549..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 105ce2d..0000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/material_theme_project_new.xml b/.idea/material_theme_project_new.xml deleted file mode 100644 index e41ef6e..0000000 --- a/.idea/material_theme_project_new.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 1d3ce46..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index fd05160..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index d5bdd28..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/notes-nextcloud b/notes-nextcloud deleted file mode 100644 index 3d852a2..0000000 --- a/notes-nextcloud +++ /dev/null @@ -1,93 +0,0 @@ -version: "3.9" - -# ⛵ Nextcloud + Collabora (CODE) behind Traefik (TLS at Traefik) -# Replace all occurrences of cloud.digitalboard.ch and office.example.com with your domains. - -services: - db: - image: postgres:16-alpine - container_name: nextcloud-postgres - restart: always - environment: - POSTGRES_DB: nextcloud - POSTGRES_USER: nextcloud - POSTGRES_PASSWORD: PVgvn5w06yvN7K8QwKacLrGNtvQformw - volumes: - - /srv/data/nextcloud/postgresql/data:/var/lib/postgresql/data - networks: - - internal - - redis: - image: redis:7-alpine - container_name: nextcloud-redis - restart: always - command: ["redis-server", "--appendonly", "yes"] - volumes: - - /srv/data/nextcloud/redis/data:/data - networks: - - internal - - nextcloud: - image: nextcloud:apache - container_name: nextcloud - restart: always - depends_on: - - db - - redis - environment: - POSTGRES_HOST: db - POSTGRES_DB: nextcloud - POSTGRES_USER: nextcloud - POSTGRES_PASSWORD: PVgvn5w06yvN7K8QwKacLrGNtvQformw - NEXTCLOUD_ADMIN_USER: tinfoil - NEXTCLOUD_ADMIN_PASSWORD: Wkcox8ZD05po1rq60Y4h2cIenws7hF7F - REDIS_HOST: redis - # REDIS_HOST_PASSWORD: "" - PHP_MEMORY_LIMIT: 1024M - PHP_UPLOAD_LIMIT: 2048M - OVERWRITEPROTOCOL: https - OVERWRITEHOST: cloud.digitalboard.ch - TRUSTED_PROXIES: "172.18.0.0/16" - volumes: - - /srv/data/nextcloud/nextcloud/:/var/www/html - - ./servername.conf:/etc/apache2/conf-enabled/servername.conf - networks: - - internal - - proxy - labels: - - traefik.enable=true - - traefik.docker.network=proxy - - traefik.http.routers.nextcloud.rule=Host(`cloud.digitalboard.ch`) - - traefik.http.routers.nextcloud.entrypoints=web - - traefik.http.services.nextcloud.loadbalancer.server.port=80 - # Ensure Nextcloud always sees HTTPS from the double proxy: - - traefik.http.middlewares.nc-https.headers.customrequestheaders.X-Forwarded-Proto=https - - traefik.http.routers.nextcloud.middlewares=nc-wellknown,nc-https - # Well-known DAV: - - traefik.http.middlewares.nc-wellknown.redirectregex.permanent=true - - traefik.http.middlewares.nc-wellknown.redirectregex.regex=^https?://([^/]+)/.well-known/(card|cal)dav - - traefik.http.middlewares.nc-wellknown.redirectregex.replacement=https://$${1}/remote.php/dav/ - - collabora: - image: collabora/code:latest - container_name: collabora - restart: always - environment: - domain: ^cloud\.example\.com$ - extra_params: --o:ssl.enable=false --o:ssl.termination=true - username: admin - password: change_me - cap_add: - - MKNOD - networks: - - proxy - labels: - - traefik.enable=true - - traefik.http.routers.collabora.rule=Host(`office-intern.example.com`) - - traefik.http.routers.collabora.entrypoints=web - - traefik.http.services.collabora.loadbalancer.server.port=9980 - -networks: - internal: - proxy: - external: true \ No newline at end of file diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index c69d79a..d7206f6 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -1,61 +1,3 @@ #SPDX-License-Identifier: MIT-0 --- # tasks file for base - -- name: Update apt cache - ansible.builtin.apt: - update_cache: true - cache_valid_time: 3600 - when: ansible_os_family == "Debian" - -- name: Install required packages for Docker - ansible.builtin.apt: - name: - - apt-transport-https - - ca-certificates - - curl - - gnupg - - lsb-release - state: present - when: ansible_os_family == "Debian" - -- name: Install convenience packages - ansible.builtin.apt: - name: - - htop - - ncdu - - vim - - curl - state: present - when: ansible_os_family == "Debian" - -- name: Add Docker GPG key - ansible.builtin.apt_key: - url: https://download.docker.com/linux/debian/gpg - state: present - when: ansible_os_family == "Debian" - -- name: Add Docker repository - ansible.builtin.apt_repository: - repo: "deb [arch=amd64] https://download.docker.com/linux/debian {{ ansible_distribution_release }} stable" - state: present - when: ansible_os_family == "Debian" - -- name: Install Docker Engine and Docker Compose plugin - ansible.builtin.apt: - name: - - docker-ce - - docker-ce-cli - - containerd.io - - docker-buildx-plugin - - docker-compose-plugin - state: present - update_cache: true - when: ansible_os_family == "Debian" - -- name: Start and enable Docker service - ansible.builtin.systemd: - name: docker - state: started - enabled: true - when: ansible_virtualization_type != "docker" diff --git a/roles/httpbin/README.md b/roles/httpbin/README.md deleted file mode 100644 index 225dd44..0000000 --- a/roles/httpbin/README.md +++ /dev/null @@ -1,38 +0,0 @@ -Role Name -========= - -A brief description of the role goes here. - -Requirements ------------- - -Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required. - -Role Variables --------------- - -A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well. - -Dependencies ------------- - -A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles. - -Example Playbook ----------------- - -Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too: - - - hosts: servers - roles: - - { role: username.rolename, x: 42 } - -License -------- - -BSD - -Author Information ------------------- - -An optional section for the role authors to include contact information, or a website (HTML is not allowed). diff --git a/roles/httpbin/defaults/main.yml b/roles/httpbin/defaults/main.yml deleted file mode 100644 index d80c316..0000000 --- a/roles/httpbin/defaults/main.yml +++ /dev/null @@ -1,19 +0,0 @@ -#SPDX-License-Identifier: MIT-0 ---- -# defaults file for httpbin - -# Base directory configuration (inherited from base role or defined here) -docker_compose_base_dir: /etc/docker/compose - -# Httpbin-specific configuration -httpbin_service_name: httpbin -httpbin_docker_compose_dir: "{{ docker_compose_base_dir }}/{{ httpbin_service_name }}" - -# Service configuration -httpbin_domain: "httpbin.local.test" -httpbin_image: "kennethreitz/httpbin" -httpbin_port: 80 - -# Traefik configuration -httpbin_traefik_network: "proxy" -httpbin_use_ssl: true diff --git a/roles/httpbin/handlers/main.yml b/roles/httpbin/handlers/main.yml deleted file mode 100644 index 400fffd..0000000 --- a/roles/httpbin/handlers/main.yml +++ /dev/null @@ -1,3 +0,0 @@ -#SPDX-License-Identifier: MIT-0 ---- -# handlers file for httpbin diff --git a/roles/httpbin/meta/main.yml b/roles/httpbin/meta/main.yml deleted file mode 100644 index 36b9858..0000000 --- a/roles/httpbin/meta/main.yml +++ /dev/null @@ -1,35 +0,0 @@ -#SPDX-License-Identifier: MIT-0 -galaxy_info: - author: your name - description: your role description - company: your company (optional) - - # If the issue tracker for your role is not on github, uncomment the - # next line and provide a value - # issue_tracker_url: http://example.com/issue/tracker - - # Choose a valid license ID from https://spdx.org - some suggested licenses: - # - BSD-3-Clause (default) - # - MIT - # - GPL-2.0-or-later - # - GPL-3.0-only - # - Apache-2.0 - # - CC-BY-4.0 - license: license (GPL-2.0-or-later, MIT, etc) - - min_ansible_version: 2.1 - - # If this a Container Enabled role, provide the minimum Ansible Container version. - # min_ansible_container_version: - - galaxy_tags: [] - # List tags for your role here, one per line. A tag is a keyword that describes - # and categorizes the role. Users find roles by searching for tags. Be sure to - # remove the '[]' above, if you add tags to this list. - # - # NOTE: A tag is limited to a single word comprised of alphanumeric characters. - # Maximum 20 tags per role. - -dependencies: [] - # List your role dependencies here, one per line. Be sure to remove the '[]' above, - # if you add dependencies to this list. diff --git a/roles/httpbin/tasks/main.yml b/roles/httpbin/tasks/main.yml deleted file mode 100644 index 618d45e..0000000 --- a/roles/httpbin/tasks/main.yml +++ /dev/null @@ -1,20 +0,0 @@ -#SPDX-License-Identifier: MIT-0 ---- -# tasks file for httpbin - -- name: Create docker compose directory - file: - path: "{{ httpbin_docker_compose_dir }}" - state: directory - mode: '0755' - -- name: Create docker-compose file for httpbin - template: - src: docker-compose.yml.j2 - dest: "{{ httpbin_docker_compose_dir }}/docker-compose.yml" - mode: '0644' - -- name: Start httpbin container - community.docker.docker_compose_v2: - project_src: "{{ httpbin_docker_compose_dir }}" - state: present diff --git a/roles/httpbin/templates/docker-compose.yml.j2 b/roles/httpbin/templates/docker-compose.yml.j2 deleted file mode 100644 index 1ab86d8..0000000 --- a/roles/httpbin/templates/docker-compose.yml.j2 +++ /dev/null @@ -1,22 +0,0 @@ -services: - httpbin: - image: {{ httpbin_image }} - container_name: {{ httpbin_service_name }} - restart: unless-stopped - networks: - - {{ httpbin_traefik_network }} - labels: - - traefik.enable=true - - traefik.docker.network={{ httpbin_traefik_network }} - - traefik.http.routers.{{ httpbin_service_name }}.rule=Host(`{{ httpbin_domain }}`) -{% if httpbin_use_ssl %} - - traefik.http.routers.{{ httpbin_service_name }}.entrypoints=websecure - - traefik.http.routers.{{ httpbin_service_name }}.tls=true -{% else %} - - traefik.http.routers.{{ httpbin_service_name }}.entrypoints=web -{% endif %} - - traefik.http.services.{{ httpbin_service_name }}.loadbalancer.server.port={{ httpbin_port }} - -networks: - {{ httpbin_traefik_network }}: - external: true diff --git a/roles/httpbin/tests/inventory b/roles/httpbin/tests/inventory deleted file mode 100644 index 03ca42f..0000000 --- a/roles/httpbin/tests/inventory +++ /dev/null @@ -1,3 +0,0 @@ -#SPDX-License-Identifier: MIT-0 -localhost - diff --git a/roles/httpbin/tests/test.yml b/roles/httpbin/tests/test.yml deleted file mode 100644 index 719d15d..0000000 --- a/roles/httpbin/tests/test.yml +++ /dev/null @@ -1,6 +0,0 @@ -#SPDX-License-Identifier: MIT-0 ---- -- hosts: localhost - remote_user: root - roles: - - httpbin diff --git a/roles/httpbin/vars/main.yml b/roles/httpbin/vars/main.yml deleted file mode 100644 index fedd529..0000000 --- a/roles/httpbin/vars/main.yml +++ /dev/null @@ -1,3 +0,0 @@ -#SPDX-License-Identifier: MIT-0 ---- -# vars file for httpbin diff --git a/roles/reverseproxy/defaults/main.yml b/roles/reverseproxy/defaults/main.yml index 7e3743d..a1d5300 100644 --- a/roles/reverseproxy/defaults/main.yml +++ b/roles/reverseproxy/defaults/main.yml @@ -2,68 +2,13 @@ --- # defaults file for reverseproxy -# Base directory configuration (inherited from base role or defined here) -docker_compose_base_dir: /etc/docker/compose -docker_volume_base_dir: /srv/data - # Service-specific configuration service_name: reverseproxy docker_compose_dir: "{{ docker_compose_base_dir }}/{{ service_name }}" docker_volume_dir: "{{ docker_volume_base_dir }}/{{ service_name }}" -# Deployment mode: 'dmz' or 'backend' -# - dmz: Public-facing reverse proxy that routes to backend servers using file provider -# - backend: Application server with docker provider for local container discovery -reverseproxy_mode: "backend" - -# SSL configuration -use_ssl: true -ssl_email: "admin@example.com" -ssl_cert_resolver: "dns" # Certificate resolver name - -# Certificate mode: 'acme' for Let's Encrypt with DNS challenge or 'selfsigned' for self-signed certs -cert_mode: "selfsigned" # Use selfsigned for vagrant, acme for production - -# ACME DNS Challenge with RFC2136 (TSIG) configuration -acme_dns_zone: "" # e.g., "digitalboard._acme.digitalboard.ch." -acme_dns_nameserver: "" # e.g., "192.168.1.1:53" -acme_tsig_algorithm: "hmac-sha256" -acme_tsig_key: "" # TSIG key name -acme_tsig_secret: "" # TSIG secret -acme_propagation_timeout: "120" -acme_polling_interval: "2" -acme_ttl: "60" - -# Self-signed certificate configuration (for vagrant/testing) -selfsigned_cert_dir: "{{ docker_volume_dir }}/certs" -selfsigned_cert_days: 365 -selfsigned_common_name: "*.local.test" - -# Dashboard -enable_dashboard: false - -# Access log configuration -enable_access_logs: true -access_log_format: "common" -log_level: "INFO" - -# Network name -traefik_network: "proxy" - -# Services to expose (defined by application roles via host_vars or group_vars) -# Each backend server should define this variable with their services -# reverseproxy_services: -# - name: httpbin -# domain: httpbin.example.com -# port: 8080 -# protocol: http # http or https -# entrypoints: [websecure] # optional, defaults based on SSL config - -# DMZ mode: Explicit backend server mapping -# Define which backend servers this DMZ proxy should route to -# If empty or undefined, routes to all servers in backend_servers group -backend_servers_to_proxy: [] -# Example: -# backend_servers_to_proxy: -# - backend1 -# - backend2 \ No newline at end of file +# Provider configuration +use_static_services: false # Use all_services from services.yml for outward-facing proxies +use_docker_provider: true # Use Docker provider for service discovery via labels +use_ssl: false # Enable SSL termination with Let's Encrypt +enable_dashboard: true # Enable Traefik dashboard \ No newline at end of file diff --git a/roles/reverseproxy/meta/main.yml b/roles/reverseproxy/meta/main.yml index 5c93db2..36b9858 100644 --- a/roles/reverseproxy/meta/main.yml +++ b/roles/reverseproxy/meta/main.yml @@ -30,5 +30,6 @@ galaxy_info: # NOTE: A tag is limited to a single word comprised of alphanumeric characters. # Maximum 20 tags per role. -dependencies: - - digitalboard.core.base +dependencies: [] + # List your role dependencies here, one per line. Be sure to remove the '[]' above, + # if you add dependencies to this list. diff --git a/roles/reverseproxy/tasks/main.yml b/roles/reverseproxy/tasks/main.yml index 3721b3d..3481bb2 100644 --- a/roles/reverseproxy/tasks/main.yml +++ b/roles/reverseproxy/tasks/main.yml @@ -2,23 +2,23 @@ --- # tasks file for reverseproxy -- name: Determine which backend servers to proxy (DMZ mode) - set_fact: - _backend_servers: "{{ backend_servers_to_proxy if backend_servers_to_proxy | length > 0 else groups['backend_servers'] | default([]) }}" - when: reverseproxy_mode == 'dmz' +- name: Gather service information from all hosts + setup: + delegate_to: "{{ item }}" + delegate_facts: true + loop: "{{ groups['all_servers'] }}" + when: use_static_services | bool -- name: Build service registry from backend servers (DMZ mode) +- name: Build service registry from all hosts set_fact: - proxied_services: "{{ proxied_services | default([]) + hostvars[item].reverseproxy_services | default([]) | map('combine', {'backend_host': hostvars[item].ansible_host | default(item)}) | list }}" - loop: "{{ _backend_servers | default([]) }}" - when: reverseproxy_mode == 'dmz' + all_services: "{{ all_services | default([]) + hostvars[item].services | default([]) | map('combine', {'backend_host': item}) | list }}" + loop: "{{ groups['all_servers'] }}" + when: use_static_services | bool - name: Debug service registry debug: - var: proxied_services - when: - - reverseproxy_mode == 'dmz' - - proxied_services is defined + var: all_services + when: use_static_services | bool - name: Create docker compose directory file: @@ -26,45 +26,33 @@ state: directory mode: '0755' -- name: Create docker volume directory +- name: Create docker volume directories file: - path: "{{ docker_volume_dir }}" + path: "{{ docker_volume_dir }}/traefik/{{ item }}" state: directory mode: '0755' - -- name: Create traefik config directory - file: - path: "{{ docker_volume_dir }}/config" - state: directory - mode: '0755' - when: reverseproxy_mode == 'dmz' - -- name: Create letsencrypt directory - file: - path: "{{ docker_volume_dir }}/letsencrypt" - state: directory - mode: '0755' - when: cert_mode == 'acme' + loop: + - letsencrypt - name: Create traefik Docker network community.docker.docker_network: - name: "{{ traefik_network }}" + name: traefik state: present - name: Generate traefik static configuration template: src: traefik.yml.j2 - dest: "{{ docker_volume_dir }}/traefik.yml" + dest: "{{ docker_compose_dir }}/traefik.yml" mode: '0644' notify: restart traefik -- name: Generate traefik dynamic configuration for DMZ services +- name: Generate traefik services configuration for discovered services template: src: services.yml.j2 - dest: "{{ docker_volume_dir }}/config/services.yml" + dest: "{{ docker_compose_dir }}/services.yml" mode: '0644' notify: restart traefik - when: reverseproxy_mode == 'dmz' + when: use_static_services | bool - name: Create docker-compose file for traefik template: @@ -75,4 +63,4 @@ - name: Start traefik container community.docker.docker_compose_v2: project_src: "{{ docker_compose_dir }}" - state: present \ No newline at end of file + state: present diff --git a/roles/reverseproxy/templates/docker-compose.yml.j2 b/roles/reverseproxy/templates/docker-compose.yml.j2 index 9c1cc93..3fe053f 100644 --- a/roles/reverseproxy/templates/docker-compose.yml.j2 +++ b/roles/reverseproxy/templates/docker-compose.yml.j2 @@ -1,39 +1,21 @@ services: traefik: - image: traefik:latest - container_name: reverseproxy + image: traefik:v3.5 + container_name: traefik restart: always -{% if cert_mode == 'acme' %} - environment: - RFC2136_NAMESERVER: "{{ acme_dns_nameserver }}" - RFC2136_TSIG_ALGORITHM: "{{ acme_tsig_algorithm }}" - RFC2136_TSIG_KEY: "{{ acme_tsig_key }}" - RFC2136_TSIG_SECRET: "{{ acme_tsig_secret }}" - RFC2136_PROPAGATION_TIMEOUT: "{{ acme_propagation_timeout }}" - RFC2136_POLLING_INTERVAL: "{{ acme_polling_interval }}" - RFC2136_TTL: "{{ acme_ttl }}" -{% endif %} ports: - "80:80" - "443:443" {% if enable_dashboard %} - - "8080:8080" + - "8080:8080" # Dashboard {% endif %} volumes: - - {{ docker_volume_dir }}/traefik.yml:/traefik.yml:ro -{% if cert_mode == 'acme' %} - - {{ docker_volume_dir }}/letsencrypt:/letsencrypt -{% endif %} -{% if reverseproxy_mode == 'dmz' %} - - {{ docker_volume_dir }}/config:/config:ro -{% endif %} -{% if reverseproxy_mode == 'backend' %} + - {{ docker_volume_dir }}/traefik/etc/traefik:/etc/traefik:ro + - {{ docker_volume_dir }}/traefik/letsencrypt:/letsencrypt - /var/run/docker.sock:/var/run/docker.sock:ro -{% endif %} networks: - - {{ traefik_network }} + - traefik networks: - {{ traefik_network }}: - name: {{ traefik_network }} + traefik: external: true \ No newline at end of file diff --git a/roles/reverseproxy/templates/middlewares.yml.j2 b/roles/reverseproxy/templates/middlewares.yml.j2 deleted file mode 100644 index 4273796..0000000 --- a/roles/reverseproxy/templates/middlewares.yml.j2 +++ /dev/null @@ -1,11 +0,0 @@ -http: - middlewares: - secure-headers: - headers: - frameDeny: true - contentTypeNosniff: true - browserXssFilter: true - forceSTSHeader: true - stsSeconds: 31536000 - stsIncludeSubdomains: true - stsPreload: true \ No newline at end of file diff --git a/roles/reverseproxy/templates/services.yml.j2 b/roles/reverseproxy/templates/services.yml.j2 index 7b8c6dd..98eecad 100644 --- a/roles/reverseproxy/templates/services.yml.j2 +++ b/roles/reverseproxy/templates/services.yml.j2 @@ -1,35 +1,30 @@ +{% if use_static_services | default(false) %} http: routers: -{% for service in proxied_services %} +{% for service in all_services %} {{ service.name }}: rule: "Host(`{{ service.domain }}`)" service: {{ service.name }}-service entryPoints: - - {{ 'websecure' if use_ssl else 'web' }} -{% if use_ssl %} +{% if use_ssl | default(false) %} + - websecure tls: -{% if cert_mode == 'acme' %} - certResolver: {{ ssl_cert_resolver }} + certResolver: letsencrypt {% else %} - {} -{% endif %} + - web {% endif %} {% endfor %} services: -{% for service in proxied_services %} +{% for service in all_services %} {{ service.name }}-service: loadBalancer: - passHostHeader: true servers: - - url: "{{ service.protocol }}://{{ service.backend_host }}:{{ service.port }}" -{% if service.protocol == 'https' and cert_mode == 'selfsigned' %} - serversTransport: insecure-transport + - url: "{{ service.upstream_protocol }}://{{ service.backend_host }}:{{ service.port }}" +{% if service.health_check is defined %} + healthCheck: + path: "{{ service.health_check }}" + interval: "30s" {% endif %} {% endfor %} - -{% if cert_mode == 'selfsigned' %} - serversTransports: - insecure-transport: - insecureSkipVerify: true {% endif %} \ No newline at end of file diff --git a/roles/reverseproxy/templates/traefik.yml.j2 b/roles/reverseproxy/templates/traefik.yml.j2 index cd3d878..18cc369 100644 --- a/roles/reverseproxy/templates/traefik.yml.j2 +++ b/roles/reverseproxy/templates/traefik.yml.j2 @@ -1,17 +1,9 @@ -log: - level: {{ log_level }} - {% if enable_dashboard %} api: dashboard: true insecure: true {% endif %} -{% if enable_access_logs %} -accessLog: - format: {{ access_log_format }} -{% endif %} - entryPoints: web: address: ":80" @@ -26,36 +18,24 @@ entryPoints: address: ":443" providers: -{% if reverseproxy_mode == 'dmz' %} +{% if use_static_services | default(false) %} file: - directory: /config + filename: /etc/traefik/services.yml watch: true {% endif %} -{% if reverseproxy_mode == 'backend' %} +{% if use_docker_provider | default(true) %} docker: endpoint: "unix:///var/run/docker.sock" - network: {{ traefik_network }} exposedByDefault: false {% endif %} -{% if use_ssl and cert_mode == 'acme' %} certificatesResolvers: - {{ ssl_cert_resolver }}: + letsencrypt: acme: - email: {{ ssl_email }} + email: admin@digitalboard.ch storage: /letsencrypt/acme.json - dnsChallenge: - provider: rfc2136 - resolvers: - - "{{ acme_dns_nameserver }}" -{% endif %} - -{% if use_ssl %} -tls: - options: - default: - minVersion: VersionTLS12 -{% endif %} + httpChallenge: + entryPoint: web global: checkNewVersion: false