traefik is now core feature

install/generator-cyphernode/generators/app/features.json

@@ -1,8 +1,4 @@
 [
-  {
-    "name": "Traefik proxy for cyphernode apps",
-    "value": "traefik"
-  },
   {
     "name": "Lightning node",
     "value": "lightning"

install/generator-cyphernode/generators/app/templates/installer/config.sh

@@ -1,17 +1,15 @@
 INSTALLER_MODE=<%= installer_mode %>
 BITCOIN_INTERNAL=<%= (bitcoin_mode==="internal"?'true':'false') %>
-FEATURE_TRAEFIK=<%= (features.indexOf('traefik') != -1)?'true':'false' %>
 FEATURE_LIGHTNING=<%= (features.indexOf('lightning') != -1)?'true':'false' %>
 FEATURE_OTSCLIENT=<%= (features.indexOf('otsclient') != -1)?'true':'false' %>
 LIGHTNING_IMPLEMENTATION=<%= lightning_implementation %>
 PROXY_DATAPATH=<%= proxy_datapath %>
 GATEKEEPER_DATAPATH=<%= gatekeeper_datapath %>
+TRAEFIK_DATAPATH=<%= traefik_datapath %>
 DOCKER_MODE=<%= docker_mode %>
 RUN_AS_USER=<%= run_as_different_user?username:'' %>
 CLEANUP=<%= installer_cleanup?'true':'false' %>
-<% if ( features.indexOf('traefik') !== -1 ) { %>
-TRAEFIK_DATAPATH=<%= traefik_datapath %>
-<% } %>
+SHARED_HTPASSWD_PATH=<%= traefik_datapath %>/htpasswd
 <% if ( features.indexOf('lightning') !== -1 && lightning_implementation === 'c-lightning' ) { %>
 LIGHTNING_DATAPATH=<%= lightning_datapath %>
 <% } %>

install/generator-cyphernode/generators/app/templates/installer/docker/docker-compose.yaml

@@ -27,6 +27,20 @@ services:
       - cyphernodenet
       - cyphernodeappsnet
     restart: always
+
+  traefik:
+    image: traefik:v1.7.9-alpine
+    restart: always
+    ports:
+      - 80:80
+      - 443:443
+    volumes:
+      - "/var/run/docker.sock:/var/run/docker.sock"
+      - "<%= traefik_datapath%>/traefik.toml:/traefik.toml"
+      - "<%= traefik_datapath%>/acme.json:/acme.json"
+    networks:
+      - cyphernodeappsnet
+
   proxy:
     command: $USER ./startproxy.sh
     # Bitcoin Mini Proxy
@@ -147,21 +161,6 @@ services:
     restart: always
 <% } %>
 
-<% if ( features.indexOf('traefik') !== -1 ) { %>
-  traefik:
-    image: traefik:v1.7.9-alpine
-    restart: always
-    ports:
-      - 80:80
-      - 443:443
-    volumes:
-      - "/var/run/docker.sock:/var/run/docker.sock"
-      - "<%= traefik_datapath%>/traefik.toml:/traefik.toml"
-      - "<%= traefik_datapath%>/acme.json:/acme.json"
-    networks:
-      - cyphernodeappsnet
-<% } %>
-
 <% if( bitcoin_mode === 'internal' ) { %>
   bitcoin:
     command: $USER bitcoind