diff --git a/templates/compose/gitlab.yml.j2 b/templates/compose/gitlab.yml.j2 index 948d940..403eb47 100644 --- a/templates/compose/gitlab.yml.j2 +++ b/templates/compose/gitlab.yml.j2 @@ -23,12 +23,16 @@ services: restart: 'unless-stopped' labels: traefik.enable: "true" +{% if gitlab_registry is sameas true} %} traefik.http.routers.gitlab.rule: "Host(`{{ gitlab_domain }}`) || Host(`{{ gitlab_registry_domain }}`)" +{% else %} + traefik.http.routers.gitlab.rule: "Host(`{{ gitlab_domain }}`)" +{% endif %} traefik.http.routers.gitlab.tls: true traefik.http.routers.gitlab.tls.certresolver: "letsencrypt" traefik.http.routers.gitlab.entrypoints: "websecure" -{% if traefik_ipwhitelist is defined %} - traefik.http.routers.grafana.middlewares: "clientips@docker" +{% if gitlab_ipwhitelist is defined %} + traefik.http.routers.gitlab.middlewares: "clientips@docker" {% endif %} traefik.http.services.gitlab.loadbalancer.server.port: "80" cap_add: