Move to Traefik

internal/component/control/control.env

@@ -1,10 +1,10 @@
-VIRTUAL_HOST=${VIRTUAL_HOST}
-
-LETSENCRYPT_HOST=${LETSENCRYPT_HOST}
-LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL}
+HOST_RULE=${HOST_RULE}
 
 CONFIG_PATH=${CONFIG_PATH}
 DEPLOY_ROOT=${DEPLOY_ROOT}
 GLOBAL_AUTHORIZED_KEYS_FILE=${GLOBAL_AUTHORIZED_KEYS_FILE}
 SELF_OVERRIDES_FILE=${SELF_OVERRIDES_FILE}
-SELF_RESOLVER_BLOCK_FILE=${SELF_RESOLVER_BLOCK_FILE}
+SELF_RESOLVER_BLOCK_FILE=${SELF_RESOLVER_BLOCK_FILE}
+
+DOCKER_NETWORK_NAME=${DOCKER_NETWORK_NAME}
+HTTPS_ENABLED=${HTTPS_ENABLED}

internal/component/control/control.go

@@ -34,9 +34,9 @@ func (control *Control) Stack(env environment.Environment) component.StackWithRe
 		EnvPath:     "control.env",
 
 		EnvContext: map[string]string{
-			"VIRTUAL_HOST":      control.Config.DefaultHost(),
-			"LETSENCRYPT_HOST":  control.Config.DefaultSSLHost(),
-			"LETSENCRYPT_EMAIL": control.Config.CertbotEmail,
+			"DOCKER_NETWORK_NAME": control.Config.DockerNetworkName,
+			"HOST_RULE":           control.Config.DefaultHostRule(),
+			"HTTPS_ENABLED":       control.Config.HTTPSEnabledEnv(),
 
 			"CONFIG_PATH": control.Config.ConfigPath,
 			"DEPLOY_ROOT": control.Config.DeployRoot,

internal/component/control/control/docker-compose.yml

@@ -5,15 +5,20 @@ services:
     build: .
     restart: always
     environment:
-      # port and hostname for this image to use
-      VIRTUAL_HOST: ${VIRTUAL_HOST}
-      VIRTUAL_PORT: 8888
-
       CONFIG_PATH: ${CONFIG_PATH}
-      
-      # optional letsencrypt email
-      LETSENCRYPT_HOST: ${LETSENCRYPT_HOST}
-      LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL}
+    labels:
+
+      - "traefik.enable=True"
+      - "eu.wiss-ki.barrel.distillery=${DOCKER_NETWORK_NAME}"
+      - "traefik.http.routers.control.rule=${HOST_RULE}"
+
+      - "traefik.http.routers.fallback.rule=HostRegexp(`{catchall:.*}`)"
+      - "traefik.http.routers.fallback.priority=1"
+
+      - "traefik.http.routers.control.tls=${HTTPS_ENABLED}"
+      - "traefik.http.routers.control.tls.certresolver=distillery"
+      - "traefik.http.services.control.loadbalancer.server.port=8888"
+
 
     volumes:
       # TODO: Mount docker socket properly!
@@ -26,5 +31,5 @@ services:
 
 networks:
   default:
-    name: distillery
+    name: ${DOCKER_NETWORK_NAME}
     external: true