ports fixed (traefik)

cyphernodeconf_docker/templates/installer/docker/docker-compose.yaml

@@ -281,8 +281,8 @@ services:
   traefik:
     image: traefik:v1.7.9-alpine
     ports:
-      - 80:80
-      - 443:443
+      - <%= traefik_http_port %>:<%= traefik_http_port %>
+      - <%= traefik_https_port %>:<%= traefik_https_port %>
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock"
       - "<%= traefik_datapath%>/traefik.toml:/traefik.toml:ro"

cyphernodeconf_docker/templates/installer/start.sh

@@ -21,20 +21,20 @@ start_apps() {
       APP_START_SCRIPT_PATH="$APP_SCRIPT_PATH/$SCRIPT_NAME"
       APP_ID=$(basename $APP_SCRIPT_PATH)
 
+      export SHARED_HTPASSWD_PATH
+      export GATEKEEPER_DATAPATH
+      export GATEKEEPER_PORT
+      export TOR_DATAPATH
+      export LIGHTNING_DATAPATH
+      export BITCOIN_DATAPATH
+      export APP_SCRIPT_PATH
+      export APP_ID
+      export DOCKER_MODE
+      export NETWORK=<%= net %>
+
       if [ -f "$APP_START_SCRIPT_PATH" ]; then
         . $APP_START_SCRIPT_PATH
       elif [ -f "$APP_SCRIPT_PATH/docker-compose.yaml" ]; then
-        export SHARED_HTPASSWD_PATH
-        export GATEKEEPER_DATAPATH
-        export GATEKEEPER_PORT
-        export TOR_DATAPATH
-        export LIGHTNING_DATAPATH
-        export BITCOIN_DATAPATH
-        export APP_SCRIPT_PATH
-        export APP_ID
-        export DOCKER_MODE
-        export NETWORK=<%= net %>
-
         if [ "$DOCKER_MODE" = "swarm" ]; then
           docker stack deploy -c $APP_SCRIPT_PATH/docker-compose.yaml $APP_ID
         elif [ "$DOCKER_MODE" = "compose" ]; then

cyphernodeconf_docker/templates/installer/testdeployment.sh

@@ -14,6 +14,8 @@ test_apps() {
   local APP_START_SCRIPT_PATH
   local APP_ID
   local returncode=0
+  local TRAEFIK_HTTP_PORT=<%= traefik_http_port %>
+  local TRAEFIK_HTTPS_PORT=<%= traefik_https_port %>
 
   for i in $current_path/apps/*
   do

cyphernodeconf_docker/templates/tor/torrc

@@ -1,8 +1,8 @@
 <% if ( torifyables.indexOf('tor_hiddenservice') !== -1 ) { %>
 HiddenServiceDir /tor/hidden_service/
 HiddenServiceVersion 3
-HiddenServicePort 80 traefik:80
-HiddenServicePort 443 traefik:443
+HiddenServicePort <%= traefik_http_port %> traefik:<%= traefik_http_port %>
+HiddenServicePort <%= traefik_https_port %> traefik:<%= traefik_https_port %>
 <% if ( torifyables.indexOf('tor_lnnode') !== -1 && lightning_expose ) { %>
 HiddenServicePort 9735 lightning:9735
 <% } %>