Correctly enable letsencrypt http challenge and provide flags to services

Author: yamalight

src/docker/start.js

@@ -78,6 +78,7 @@ exports.startFromParams = async ({
   // if we have letsencrypt enabled - enable https redirect
   if (serverConfig.letsencrypt) {
     Labels[`traefik.http.middlewares.${name}-https.redirectscheme.scheme`] = 'https';
+    Labels['traefik.http.routers.whoami.tls.certresolver'] = 'exoframeChallenge';
     middlewares.push(`${name}-https@docker`);
   }
 
@@ -236,6 +237,7 @@ exports.start = async ({image, username, folder, resultStream, existing = []}) =
   // if we have letsencrypt enabled - enable https redirect
   if (serverConfig.letsencrypt && (config.letsencrypt || config.letsencrypt === undefined)) {
     Labels[`traefik.http.middlewares.${name}-https.redirectscheme.scheme`] = 'https';
+    Labels['traefik.http.routers.whoami.tls.certresolver'] = 'exoframeChallenge';
     middlewares.push(`${name}-https@docker`);
   }
 

src/docker/traefik.js

@@ -92,9 +92,10 @@ exports.initTraefik = async exoNet => {
   const letsencrypt = [
     '--entryPoints.web.address=:80',
     '--entryPoints.websecure.address=:443',
-    `--certificatesResolvers.exoframe.acme.email=${config.letsencryptEmail}`,
-    '--certificatesResolvers.exoframe.acme.storage=/var/traefik/acme.json',
-    '--certificatesResolvers.exoframe.acme.httpChallenge.entryPoint=web',
+    '--certificatesresolvers.exoframeChallenge.acme.httpchallenge=true',
+    `--certificatesResolvers.exoframeChallenge.acme.email=${config.letsencryptEmail}`,
+    '--certificatesResolvers.exoframeChallenge.acme.storage=/var/traefik/acme.json',
+    '--certificatesResolvers.exoframeChallenge.acme.httpChallenge.entryPoint=web',
   ];
 
   // construct command