diff --git a/containers/collabora/tasks.yml b/containers/collabora/tasks.yml index 03e578d..3fecfbd 100644 --- a/containers/collabora/tasks.yml +++ b/containers/collabora/tasks.yml @@ -50,8 +50,6 @@ name: collabora image: docker.io/collabora/code:latest state: present - cap_add: - - MKNOD network: - traefik-collabora - nextcloud-collabora @@ -61,7 +59,7 @@ io.containers.autoupdate: "registry" traefik.enable: "true" traefik.http.routers.collabora.entrypoints: "https" - traefik.http.routers.collabora.rule: "Host(`{{ vault_domain }}`) && PathPrefix(`/collabora`,`/browser`)" + traefik.http.routers.collabora.rule: "Host(`{{ vault_domain }}`) && (PathPrefix(`/collabora`) || Path(`/browser`))" traefik.http.routers.collabora.tls: "true" traefik.http.routers.collabora.tls.certresolver: "wildcard" traefik.http.routers.collabora.service: "collabora" @@ -70,9 +68,10 @@ env: domain: "chef\\.heaplab\\.deib\\.polimi\\.it" aliasgroup1: "chef\\.heaplab\\.deib\\.polimi\\.it" + server_name: "chef.heaplab.deib.polimi.it" username: "{{ vault_collabora_user }}" password: "{{ vault_collabora_password }}" - extra_params: "--o:ssl.enable=false --o:ssl.termination=true --o:net.service_root=/collabora" + extra_params: "--o:ssl.enable=false --o:ssl.termination=true --o:net.service_root=/collabora --o:net.server_name=chef.heaplab.deib.polimi.it/collabora" generate_systemd: path: /home/containers/.config/systemd/user/ restart_policy: on-failure diff --git a/containers/traefik/tasks.yml b/containers/traefik/tasks.yml index 31e237f..34111d4 100644 --- a/containers/traefik/tasks.yml +++ b/containers/traefik/tasks.yml @@ -118,7 +118,7 @@ traefik.enable: "true" traefik.http.middlewares.traefik-auth.basicauth.users: "{{ vault_traefik_basic_auth }}" traefik.http.routers.traefik.entrypoints: "https" - traefik.http.routers.traefik.rule: "Host(`{{ vault_domain }}`) && PathPrefix(`/api`,`/dashboard`)" + traefik.http.routers.traefik.rule: "Host(`{{ vault_domain }}`) && (PathPrefix(`/api`) || Path(`/dashboard`))" traefik.http.routers.traefik.middlewares: "traefik-auth@docker" traefik.http.routers.traefik.tls: "true" traefik.http.routers.traefik.tls.certresolver: "wildcard"