diff --git a/firewall-dns.json b/firewall-dns.json index f4b7cd5..cbe8d3d 100644 --- a/firewall-dns.json +++ b/firewall-dns.json @@ -21,7 +21,17 @@ "SOURCE": "/etc/user/config/services", "DEST": "/services", "TYPE": "ro" - } + }, + { + "SOURCE": "/var/run/docker.sock", + "DEST": "/var/run/docker.sock", + "TYPE": "rw" + }, + { + "SOURCE": "/usr/bin/docker", + "DEST": "/usr/bin/docker", + "TYPE": "ro" + } ], "PORTS": [ ], "READYNESS": [ @@ -30,38 +40,14 @@ {"EXEC": "/ready.sh"} ], "ENVS": [ - { - "NAME": "CHAIN", - "VALUE": "DOCKER-USER" - }, - { - "NAME": "SOURCE_IP", - "VALUE": "172.18.103.2" - }, - { - "NAME": "TARGET_IP", - "VALUE": "172.18.255.2" - }, - { - "NAME": "TYPE", - "VALUE": "udp" - }, - { - "NAME": "TARGET_PORT_1", - "VALUE": "53" - }, - { - "NAME": "TARGET_PORT_2", - "VALUE": "67" - }, - { - "NAME": "TARGET_PORT_3", - "VALUE": "68" - }, - { - "NAME": "COMMENT", - "VALUE": "behbeq37s6" - } + { "CHAIN": "DOCKER-USER" }, + { "SOURCE": "smarthost_loadbalancer" }, + { "TARGET": "proxy_dns" }, + { "TYPE": "udp" }, + { "TARGET_PORT_1": "53" }, + { "TARGET_PORT_2": "67" }, + { "TARGET_PORT_2": "68" }, + { "COMMENT": "smarthost_proxy_dns" } ], "EXTRA": "--privileged --rm", "DEPEND": "null", diff --git a/firewall-letsencrypt.json b/firewall-letsencrypt.json index 416d94c..aa6e65c 100644 --- a/firewall-letsencrypt.json +++ b/firewall-letsencrypt.json @@ -21,7 +21,17 @@ "SOURCE": "/etc/user/config/services", "DEST": "/services", "TYPE": "ro" - } + }, + { + "SOURCE": "/var/run/docker.sock", + "DEST": "/var/run/docker.sock", + "TYPE": "rw" + }, + { + "SOURCE": "/usr/bin/docker", + "DEST": "/usr/bin/docker", + "TYPE": "ro" + } ], "PORTS": [ ], "READYNESS": [ @@ -30,30 +40,12 @@ {"EXEC": "/ready.sh"} ], "ENVS": [ - { - "NAME": "CHAIN", - "VALUE": "DOCKER-USER" - }, - { - "NAME": "SOURCE_IP", - "VALUE": "172.18.103.2" - }, - { - "NAME": "TARGET_IP", - "VALUE": "172.18.254.254" - }, - { - "NAME": "TYPE", - "VALUE": "tcp" - }, - { - "NAME": "TARGET_PORT", - "VALUE": "80" - }, - { - "NAME": "COMMENT", - "VALUE": "29eexhrh" - } + { "CHAIN": "DOCKER-USER" }, + { "SOURCE": "smarthost_loadbalancer" }, + { "TARGET": "proxy_dns" }, + { "TYPE": "tcp" }, + { "TARGET_PORT_1": "80" }, + { "COMMENT": "letsencrypt" } ], "EXTRA": "--privileged --rm", "DEPEND": "null", diff --git a/firewall_backend1-zc93hhth.json b/firewall_backend1-zc93hhth.json deleted file mode 100644 index 210e1f6..0000000 --- a/firewall_backend1-zc93hhth.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "main": { - "SERVICE_NAME": "firewalls", - "DOMAIN": "null" - }, - "containers": [ - { - "IMAGE": "registry.format.hu/firewall", - "NAME": "firewall", - "MEMORY": "64M", - "IP": "null", - "NETWORK": "host", - "SCALE": "0", - "VOLUMES": [ - { - "SOURCE": "/run/", - "DEST": "/run/", - "TYPE": "rw" - }, - { - "SOURCE": "/etc/user/config/services", - "DEST": "/services", - "TYPE": "ro" - } - ], - "PORTS": [ ], - "READYNESS": [ - {"tcp": ""}, - {"HTTP": ""}, - {"EXEC": "/ready.sh"} - ], - "ENVS": [ - { - "NAME": "CHAIN", - "VALUE": "DOCKER-USER" - }, - { - "NAME": "SOURCE_IP", - "VALUE": "172.18.103.2" - }, - { - "NAME": "TARGET_IP", - "VALUE": "172.18.104.2" - }, - { - "NAME": "TYPE", - "VALUE": "tcp" - }, - { - "NAME": "TARGET_PORT_1", - "VALUE": "80" - }, - { - "NAME": "TARGET_PORT_2", - "VALUE": "443" - }, - { - "NAME": "COMMENT", - "VALUE": "zc93hhth" - } - ], - "EXTRA": "--privileged --rm", - "DEPEND": "null", - "START_ON_BOOT": "false", - "CMD": "null", - "PRE_START": "null", - "POST_START": "null" - } - ] -} diff --git a/firewall_backend2-g4rg38th.json b/firewall_backend2-g4rg38th.json deleted file mode 100644 index 99793b4..0000000 --- a/firewall_backend2-g4rg38th.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "main": { - "SERVICE_NAME": "firewalls", - "DOMAIN": "null" - }, - "containers": [ - { - "IMAGE": "registry.format.hu/firewall", - "NAME": "firewall", - "MEMORY": "64M", - "IP": "null", - "NETWORK": "host", - "SCALE": "0", - "VOLUMES": [ - { - "SOURCE": "/run/", - "DEST": "/run/", - "TYPE": "rw" - }, - { - "SOURCE": "/etc/user/config/services", - "DEST": "/services", - "TYPE": "ro" - } - ], - "PORTS": [ ], - "READYNESS": [ - {"tcp": ""}, - {"HTTP": ""}, - {"EXEC": "/ready.sh"} - ], - "ENVS": [ - { - "NAME": "CHAIN", - "VALUE": "DOCKER-USER" - }, - { - "NAME": "SOURCE_IP", - "VALUE": "172.18.103.2" - }, - { - "NAME": "TARGET_IP", - "VALUE": "172.18.105.2" - }, - { - "NAME": "TYPE", - "VALUE": "tcp" - }, - { - "NAME": "TARGET_PORT_1", - "VALUE": "80" - }, - { - "NAME": "TARGET_PORT_2", - "VALUE": "443" - }, - { - "NAME": "COMMENT", - "VALUE": "g4rg38th" - } - ], - "EXTRA": "--privileged --rm", - "DEPEND": "null", - "START_ON_BOOT": "false", - "CMD": "null", - "PRE_START": "null", - "POST_START": "null" - } - ] -} diff --git a/proxy_config b/proxy_config index a036d47..8fe5ce4 100644 --- a/proxy_config +++ b/proxy_config @@ -13,9 +13,9 @@ "ROLE": "smarthost-backend-proxy", "SERVICE_NAME": "smarthost-proxy" }, - "loadbalancer": { + "smarthost_loadbalancer": { "letsencrypt": "letsencrypt", - "backend1": "backend1", - "backend2": "backend2" + "backend1": "smarthost_backend1", + "backend2": "smarthost_backend2" } } diff --git a/smarthost-proxy.json b/smarthost-proxy.json index 00480a2..bbebb21 100644 --- a/smarthost-proxy.json +++ b/smarthost-proxy.json @@ -29,26 +29,12 @@ "containers": [ { "IMAGE": "registry.format.hu/haproxy:2.5.4", - "NAME": "loadbalancer-27dhuwth", + "NAME": "smarthost_loadbalancer-27dhuwth", "ROLES": "smarthost-frontend-proxy", "MEMORY": "128M", "IP": "172.18.103.2", "NETWORK": "smarthost-loadbalancer", "DNS": [ "proxy_dns" ], - "ENVS": [ - { - "NAME": "letsencrypt", - "VALUE": "letsencrypt" - }, - { - "NAME": "backend1", - "VALUE": "backend1" - }, - { - "NAME": "backend2", - "VALUE": "backend2" - } - ], "READYNESS": [ {"tcp": "80"}, {"HTTP": "8080"}, @@ -87,7 +73,7 @@ }, { "IMAGE": "registry.format.hu/nginx:1.21", - "NAME": "backend-zc93hhth", + "NAME": "smarthost_backend1-zc93hhth", "ROLES": "smarthost-backend-proxy", "MEMORY": "64M", "IP": "172.18.104.2", @@ -135,7 +121,7 @@ }, { "IMAGE": "registry.format.hu/nginx:1.21", - "NAME": "backend-g4rg38th", + "NAME": "smarthost_backend2-g4rg38th", "ROLES": "smarthost-backend-proxy", "MEMORY": "64M", "IP": "172.18.105.2",