Skip to content
Snippets Groups Projects
Commit eecf534f authored by jurgenhaas's avatar jurgenhaas
Browse files

Merge branch 'develop' into 'main'

Merging develop into main

See merge request !62
parents 35e61554 f5135330
No related branches found
No related tags found
1 merge request!62Merging develop into main
Pipeline #783474 passed
......@@ -163,7 +163,7 @@ services:
{% endif %}
traefik.http.routers.{{ webserver.type }}-{{ projectname }}.rule: Host(`{{ projectdomain }}`){% for domain in extradomains|default([]) %} || Host(`{{ domain }}`){% endfor %}
{% if drupal.live|default(0) %}
{% if drupal.live|default(0) or traefik.usessl %}
traefik.http.routers.{{ webserver.type }}-{{ projectname }}.tls: 'true'
traefik.http.routers.{{ webserver.type }}-{{ projectname }}.tls.certresolver: lakedrops
{% endif %}
......@@ -206,6 +206,10 @@ services:
traefik.enable: 'true'
traefik.docker.network: traefik-public
traefik.http.routers.varnish-{{ projectname }}.rule: Host(`varnish-{{ projectdomain }}`)
{% if drupal.live|default(0) or traefik.usessl %}
traefik.http.routers.varnish-{{ projectname }}.tls: 'true'
traefik.http.routers.varnish-{{ projectname }}.tls.certresolver: lakedrops
{% endif %}
{% endif %}
......@@ -238,6 +242,10 @@ services:
traefik.docker.network: traefik-public
traefik.http.services.{{ projectname }}_adminer.loadbalancer.server.port: 9000
traefik.http.routers.adminer-{{ projectname }}.rule: Host(`adminer-{{ projectdomain }}`)
{% if drupal.live|default(0) or traefik.usessl %}
traefik.http.routers.adminer-{{ projectname }}.tls: 'true'
traefik.http.routers.adminer-{{ projectname }}.tls.certresolver: lakedrops
{% endif %}
{% elseif dbbrowser.type == 'pma' %}
pma:
image: '{{ docker_image_prefix }}phpmyadmin/phpmyadmin:latest'
......@@ -259,6 +267,10 @@ services:
traefik.enable: 'true'
traefik.docker.network: traefik-public
traefik.http.routers.pma-{{ projectname }}.rule: Host(`pma-{{ projectdomain }}`)
{% if drupal.live|default(0) or traefik.usessl %}
traefik.http.routers.pma-{{ projectname }}.tls: 'true'
traefik.http.routers.pma-{{ projectname }}.tls.certresolver: lakedrops
{% endif %}
{% endif %}
{% endif %}
{% if solr.enable %}
......@@ -281,6 +293,10 @@ services:
traefik.docker.network: traefik-public
traefik.http.services.{{ projectname }}_solr.loadbalancer.server.port: 8983
traefik.http.routers.solr-{{ projectname }}.rule: Host(`solr-{{ projectdomain }}`)
{% if drupal.live|default(0) or traefik.usessl %}
traefik.http.routers.solr-{{ projectname }}.tls: 'true'
traefik.http.routers.solr-{{ projectname }}.tls.certresolver: lakedrops
{% endif %}
{% endif %}
{% if mailhog.enable and (not drupal.live|default(0) or staging) %}
......@@ -308,7 +324,7 @@ services:
{% endif %}
traefik.http.services.{{ projectname }}_mailhog.loadbalancer.server.port: 8025
traefik.http.routers.mailhog-{{ projectname }}.rule: Host(`mailhog-{{ projectdomain }}`)
{% if drupal.live|default(0) %}
{% if drupal.live|default(0) or traefik.usessl %}
traefik.http.routers.mailhog-{{ projectname }}.tls: 'true'
traefik.http.routers.mailhog-{{ projectname }}.tls.certresolver: lakedrops
{% endif %}
......@@ -327,6 +343,10 @@ services:
traefik.docker.network: traefik-public
traefik.http.services.{{ projectname }}_nodejs.loadbalancer.server.port: 8080
traefik.http.routers.nodejs-{{ projectname }}.rule: Host(`nodejs-{{ projectdomain }}`)
{% if drupal.live|default(0) or traefik.usessl %}
traefik.http.routers.nodejs-{{ projectname }}.tls: 'true'
traefik.http.routers.nodejs-{{ projectname }}.tls.certresolver: lakedrops
{% endif %}
volumes:
- /etc/timezone:/etc/timezone:ro
- /etc/localtime:/etc/localtime:ro
......@@ -344,6 +364,10 @@ services:
traefik.docker.network: traefik-public
traefik.http.services.{{ projectname }}_node.loadbalancer.server.port: 3000
traefik.http.routers.node-{{ projectname }}.rule: Host(`front-{{ projectdomain }}`)
{% if drupal.live|default(0) or traefik.usessl %}
traefik.http.routers.node-{{ projectname }}.tls: 'true'
traefik.http.routers.node-{{ projectname }}.tls.certresolver: lakedrops
{% endif %}
expose:
- '3000'
volumes:
......@@ -418,6 +442,10 @@ services:
traefik.docker.network: traefik-public
traefik.http.services.{{ projectname }}_webgrind.loadbalancer.server.port: 8080
traefik.http.routers.webgrind-{{ projectname }}.rule: Host(`webgrind-{{ projectdomain }}`)
{% if drupal.live|default(0) or traefik.usessl %}
traefik.http.routers.webgrind-{{ projectname }}.tls: 'true'
traefik.http.routers.webgrind-{{ projectname }}.tls.certresolver: lakedrops
{% endif %}
volumes:
- /etc/timezone:/etc/timezone:ro
- /etc/localtime:/etc/localtime:ro
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment