2104e5fe7d
- Drop `recreate: always` from collabora/drawio/homarr/opencloud/traefik handlers and the authentik_outpost_ldap start task. `up -d` with `state: present` already recreates exactly the services whose compose definition changed; the blanket recreate was forcing restarts even when nothing relevant moved. - Rewrite the `*_domains` Traefik Host loop to the `Host(\`a\`) || Host(\`b\`)` form across authentik/collabora/garage/nextcloud so the rule still matches when traefik can't normalize the comma-form into the same canonical shape. - Traefik: add `traefik_acme_tcp_only` (sets LEGO_EXPERIMENTAL_DNS_TCP_ONLY) and `traefik_acme_disable_ans_checks` (disables lego's authoritative-NS propagation check) for environments where the DNS path between the traefik container and the zone's nameservers is constrained. - Traefik DMZ collector: two-step merge so a `traefik_dmz_exposed_services` entry that sets its own `backend_host` wins over the host fallback; lets a route target an internal FQDN covered by the backend cert's SANs instead of the raw IP. - Nextcloud: add `nextcloud_notify_push_domain` override for the `occ notify_push:setup` call so the setup check can hit an internal FQDN instead of hairpinning through the DMZ. Push router now matches every entry in `nextcloud_domains`. - Nextcloud: also %2F-escape slashes in the postgres user/password inside the notify_push DATABASE_URL.
68 lines
No EOL
3.1 KiB
Django/Jinja
68 lines
No EOL
3.1 KiB
Django/Jinja
services:
|
|
{{ garage_service_name }}:
|
|
container_name: {{ garage_service_name }}
|
|
image: {{ garage_image }}
|
|
restart: always
|
|
volumes:
|
|
- {{ garage_docker_volume_dir }}/meta:/var/lib/garage/meta
|
|
- {{ garage_docker_volume_dir }}/data:/var/lib/garage/data
|
|
- {{ garage_docker_compose_dir }}/garage.toml:/etc/garage.toml
|
|
networks:
|
|
- {{ garage_traefik_network }}
|
|
- {{ garage_internal_network }}
|
|
labels:
|
|
- traefik.enable=true
|
|
- traefik.docker.network={{ garage_traefik_network }}
|
|
# S3 API endpoint
|
|
- traefik.http.routers.{{ garage_service_name }}.rule={% for d in garage_s3_domains %}Host(`{{ d }}`){% if not loop.last %} || {% endif %}{% endfor +%}
|
|
{% if garage_use_ssl %}
|
|
- traefik.http.routers.{{ garage_service_name }}.entrypoints=websecure
|
|
- traefik.http.routers.{{ garage_service_name }}.tls=true
|
|
{% if traefik_cert_mode | default('selfsigned') == 'acme' %}
|
|
- traefik.http.routers.{{ garage_service_name }}.tls.certresolver={{ traefik_ssl_cert_resolver | default('dns') }}
|
|
{% endif %}
|
|
{% else %}
|
|
- traefik.http.routers.{{ garage_service_name }}.entrypoints=web
|
|
{% endif %}
|
|
- traefik.http.routers.{{ garage_service_name }}.service={{ garage_service_name }}-api
|
|
- traefik.http.routers.{{ garage_service_name }}.priority=50
|
|
- traefik.http.services.{{ garage_service_name }}-api.loadbalancer.server.port={{ garage_s3_api_port }}
|
|
|
|
{% if garage_webui_enabled %}
|
|
{{ garage_service_name }}-webui:
|
|
container_name: {{ garage_service_name }}-webui
|
|
image: {{ garage_webui_image }}
|
|
restart: always
|
|
depends_on:
|
|
- {{ garage_service_name }}
|
|
environment:
|
|
API_BASE_URL: "http://{{ garage_service_name }}:{{ garage_admin_port }}"
|
|
S3_ENDPOINT_URL: "http://{{ garage_service_name }}:{{ garage_s3_api_port }}"
|
|
AUTH_USER_PASS: '{{ _garage_webui_password_hash.stdout | replace("$", "$$") }}'
|
|
volumes:
|
|
- {{ garage_docker_compose_dir }}/garage.toml:/etc/garage.toml:ro
|
|
networks:
|
|
- {{ garage_traefik_network }}
|
|
- {{ garage_internal_network }}
|
|
labels:
|
|
- traefik.enable=true
|
|
- traefik.docker.network={{ garage_traefik_network }}
|
|
- traefik.http.routers.{{ garage_service_name }}-console.rule=Host(`{{ garage_webui_domain }}`)
|
|
{% if garage_use_ssl %}
|
|
- traefik.http.routers.{{ garage_service_name }}-console.entrypoints=websecure
|
|
- traefik.http.routers.{{ garage_service_name }}-console.tls=true
|
|
{% if traefik_cert_mode | default('selfsigned') == 'acme' %}
|
|
- traefik.http.routers.{{ garage_service_name }}-console.tls.certresolver={{ traefik_ssl_cert_resolver | default('dns') }}
|
|
{% endif %}
|
|
{% else %}
|
|
- traefik.http.routers.{{ garage_service_name }}-console.entrypoints=web
|
|
{% endif %}
|
|
- traefik.http.routers.{{ garage_service_name }}-console.service={{ garage_service_name }}-console
|
|
- traefik.http.routers.{{ garage_service_name }}-console.priority=10
|
|
- traefik.http.services.{{ garage_service_name }}-console.loadbalancer.server.port={{ garage_webui_port }}
|
|
{% endif %}
|
|
|
|
networks:
|
|
{{ garage_internal_network }}:
|
|
{{ garage_traefik_network }}:
|
|
external: true |