🐛 Fix certificate generation bugs (#249)

* Add CERTIFICATE_FQDN

* Fix osparc-public certificate generation j2 magic

---------

Co-authored-by: kaiser <[email protected]>

Author: mrnicegyu11

services/traefik/Makefile

@@ -91,7 +91,7 @@ ${TEMP_COMPOSE}-public: docker-compose.yml docker-compose.public.yml docker-comp
 	@set -o allexport; \
 	source .env; \
 	set +o allexport; \
-	${REPO_BASE_DIR}/scripts/docker-compose-config.bash -e .env $< docker-compose.public.yml > $@
+	${REPO_BASE_DIR}/scripts/docker-compose-config.bash -e .env $< docker-compose.public.yml docker-compose.letsencrypt.dns.yml > $@
 
 .PHONY: ${TEMP_COMPOSE}-master
 ${TEMP_COMPOSE}-master: docker-compose.yml docker-compose.master.yml docker-compose.letsencrypt.dns.yml .env

services/traefik/docker-compose.letsencrypt.dns.yml.j2

@@ -7,11 +7,13 @@ services:
         - traefik.http.routers.api.tls.certresolver=myresolver
         - traefik.http.middlewares.ops_whitelist_ips.ipwhitelist.sourcerange=${TRAEFIK_IPWHITELIST_SOURCERANGE}
         # What follows is a tested workaround to ensure letsencrypt certificates for products' domains are generated
-{% for j2item in DEPLOYMENT_FQDNS.split(",") + [MACHINE_FQDN] %}
+{% for j2item in DEPLOYMENT_FQDNS.split(",") + [MACHINE_FQDN] + CERTIFICATE_GENERATION_FQDNS.split(",") %}
+{% if j2item and j2item.replace('@','').replace(' ','').replace('.','').replace('-','').replace('\'','') != ""  %}
         - traefik.http.routers.{{j2item.replace('@','').replace(' ','').replace('.','').replace('-','').replace('\'','')}}.tls.domains[0].main=service.{{j2item.replace(' ','').replace('\'','')}}
         - traefik.http.routers.{{j2item.replace('@','').replace(' ','').replace('.','').replace('-','').replace('\'','')}}.tls.domains[0].sans=*.services.{{j2item.replace(' ','').replace('\'','')}}
         - traefik.http.routers.{{j2item.replace('@','').replace(' ','').replace('.','').replace('-','').replace('\'','')}}testing.tls.domains[0].main=service.testing.{{j2item.replace(' ','').replace('\'','')}}
         - traefik.http.routers.{{j2item.replace('@','').replace(' ','').replace('.','').replace('-','').replace('\'','')}}testing.tls.domains[0].sans=*.services.testing.{{j2item.replace(' ','').replace('\'','')}}
         - traefik.http.routers.{{j2item.replace('@','').replace(' ','').replace('.','').replace('-','').replace('\'','')}}testing.tls.certresolver=myresolver
         - traefik.http.routers.{{j2item.replace('@','').replace(' ','').replace('.','').replace('-','').replace('\'','')}}.tls.certresolver=myresolver
+{% endif %}
 {% endfor %}

services/traefik/docker-compose.yml.j2

@@ -121,7 +121,6 @@ services:
         # prometheus labels
         - prometheus-job=traefik_ops
         - prometheus-port=8082
-
         # wildcard certificate
         - traefik.http.routers.api.tls.domains[0].main=service.${MACHINE_FQDN}
         - traefik.http.routers.api.tls.domains[0].sans=*.services.${MACHINE_FQDN}

services/traefik/template.env

@@ -28,3 +28,4 @@ S3_ENDPOINT=${S3_ENDPOINT}
 OPS_TRAEFIK_REPLICAS=${OPS_TRAEFIK_REPLICAS}
 OSPARC_DEVOPS_MAIL_ADRESS=${OSPARC_DEVOPS_MAIL_ADRESS}
 DEPLOYMENT_FQDNS='${DEPLOYMENT_FQDNS}'
+CERTIFICATE_GENERATION_FQDNS='${CERTIFICATE_GENERATION_FQDNS}'