diff --git a/firewall-29eexhrh.json b/firewall-29eexhrh.json index 744bf38..18312ea 100644 --- a/firewall-29eexhrh.json +++ b/firewall-29eexhrh.json @@ -6,7 +6,7 @@ "containers": [ { "IMAGE": "registry.format.hu/firewall", - "NAME": "null", + "NAME": "firewall", "MEMORY": "64M", "IP": "null", "NETWORK": "host", @@ -54,7 +54,7 @@ "VALUE": "29eexhrh" } ], - "EXTRA": "--privileged", + "EXTRA": "--privileged --rm", "DEPEND": "null", "START_ON_BOOT": "false", "CMD": "null", diff --git a/firewall-dns.json b/firewall-dns.json index 4a1f5b9..862acb6 100644 --- a/firewall-dns.json +++ b/firewall-dns.json @@ -6,8 +6,9 @@ "containers": [ { "IMAGE": "registry.format.hu/firewall", - "NAME": "firewall_dns-public", + "NAME": "firewall", "MEMORY": "64M", + "IP": "null", "NETWORK": "host", "VOLUMES": [ { @@ -34,7 +35,7 @@ }, { "NAME": "SOURCE_IP", - "VALUE": "172.18.100.2" + "VALUE": "172.18.103.2" }, { "NAME": "TARGET_IP", @@ -61,7 +62,7 @@ "VALUE": "behbeq37s6" } ], - "EXTRA": "--privileged", + "EXTRA": "--privileged --rm", "DEPEND": "null", "START_ON_BOOT": "false", "CMD": "null", diff --git a/firewall-letsencrypt.json b/firewall-letsencrypt.json new file mode 100644 index 0000000..18312ea --- /dev/null +++ b/firewall-letsencrypt.json @@ -0,0 +1,65 @@ +{ + "main": { + "SERVICE_NAME": "firewalls", + "DOMAIN": "null" + }, + "containers": [ + { + "IMAGE": "registry.format.hu/firewall", + "NAME": "firewall", + "MEMORY": "64M", + "IP": "null", + "NETWORK": "host", + "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.254.254" + }, + { + "NAME": "TYPE", + "VALUE": "tcp" + }, + { + "NAME": "TARGET_PORT", + "VALUE": "80" + }, + { + "NAME": "COMMENT", + "VALUE": "29eexhrh" + } + ], + "EXTRA": "--privileged --rm", + "DEPEND": "null", + "START_ON_BOOT": "false", + "CMD": "null", + "PRE_START": "null", + "POST_START": "null" + } + ] +} diff --git a/firewall_dns-behbeq37s6.json b/firewall-smarhost-loadbalancer.json similarity index 76% rename from firewall_dns-behbeq37s6.json rename to firewall-smarhost-loadbalancer.json index 34295b1..e2f2609 100644 --- a/firewall_dns-behbeq37s6.json +++ b/firewall-smarhost-loadbalancer.json @@ -6,7 +6,7 @@ "containers": [ { "IMAGE": "registry.format.hu/firewall", - "NAME": "null", + "NAME": "firewall", "MEMORY": "64M", "IP": "null", "NETWORK": "host", @@ -34,35 +34,35 @@ "VALUE": "DOCKER-USER" }, { - "NAME": "SOURCE_IP", - "VALUE": "172.18.100.2" + "NAME": "SOURCE_IP_1", + "VALUE": "172.18.101.2" + }, + { + "NAME": "SOURCE_IP_2", + "VALUE": "172.18.102.2" }, { "NAME": "TARGET_IP", - "VALUE": "172.18.255.2" + "VALUE": "172.18.103.2" }, { "NAME": "TYPE", - "VALUE": "udp" + "VALUE": "tcp" }, { "NAME": "TARGET_PORT_1", - "VALUE": "53" + "VALUE": "80" }, { "NAME": "TARGET_PORT_2", - "VALUE": "67" - }, - { - "NAME": "TARGET_PORT_3", - "VALUE": "68" + "VALUE": "443" }, { "NAME": "COMMENT", - "VALUE": "behbeq37s6" + "VALUE": "27dhuwth" } ], - "EXTRA": "--privileged", + "EXTRA": "--privileged --rm", "DEPEND": "null", "START_ON_BOOT": "false", "CMD": "null", diff --git a/firewall_backend1-zc93hh9u.json b/firewall_backend1-zc93hhth.json similarity index 89% rename from firewall_backend1-zc93hh9u.json rename to firewall_backend1-zc93hhth.json index 7e2b636..dc815c9 100644 --- a/firewall_backend1-zc93hh9u.json +++ b/firewall_backend1-zc93hhth.json @@ -6,7 +6,7 @@ "containers": [ { "IMAGE": "registry.format.hu/firewall", - "NAME": "null", + "NAME": "firewall", "MEMORY": "64M", "IP": "null", "NETWORK": "host", @@ -35,11 +35,11 @@ }, { "NAME": "SOURCE_IP", - "VALUE": "172.18.100.2" + "VALUE": "172.18.103.2" }, { "NAME": "TARGET_IP", - "VALUE": "172.18.101.2" + "VALUE": "172.18.104.2" }, { "NAME": "TYPE", @@ -55,10 +55,10 @@ }, { "NAME": "COMMENT", - "VALUE": "zc93hh9u" + "VALUE": "zc93hhth" } ], - "EXTRA": "--privileged", + "EXTRA": "--privileged --rm", "DEPEND": "null", "START_ON_BOOT": "false", "CMD": "null", diff --git a/firewall_backend2-g4rg38gr83.json b/firewall_backend2-g4rg38th.json similarity index 89% rename from firewall_backend2-g4rg38gr83.json rename to firewall_backend2-g4rg38th.json index 9bc0ef6..de107e0 100644 --- a/firewall_backend2-g4rg38gr83.json +++ b/firewall_backend2-g4rg38th.json @@ -6,7 +6,7 @@ "containers": [ { "IMAGE": "registry.format.hu/firewall", - "NAME": "null", + "NAME": "firewall", "MEMORY": "64M", "IP": "null", "NETWORK": "host", @@ -35,11 +35,11 @@ }, { "NAME": "SOURCE_IP", - "VALUE": "172.18.100.2" + "VALUE": "172.18.103.2" }, { "NAME": "TARGET_IP", - "VALUE": "172.18.102.2" + "VALUE": "172.18.105.2" }, { "NAME": "TYPE", @@ -55,10 +55,10 @@ }, { "NAME": "COMMENT", - "VALUE": "g4rg38gr83" + "VALUE": "g4rg38th" } ], - "EXTRA": "--privileged", + "EXTRA": "--privileged --rm", "DEPEND": "null", "START_ON_BOOT": "false", "CMD": "null", diff --git a/letsencrypt.json b/letsencrypt.json index 2f2f245..5781d82 100644 --- a/letsencrypt.json +++ b/letsencrypt.json @@ -15,7 +15,7 @@ "containers": [ { "IMAGE": "registry.format.hu/letsencrypt:latest", - "NAME": "letsencrypt-rz56t7ir", + "NAME": "letsencrypt", "MEMORY": "64M", "IP": "172.18.254.254", "NETWORK": "letsencrypt", @@ -38,7 +38,7 @@ {"HTTP": ""}, {"EXEC": "/ready.sh"} ], - "EXTRA": "", + "EXTRA": "--rm", "DEPEND": "null", "START_ON_BOOT": "false", "CMD": "null", diff --git a/proxy-dns.json b/proxy-dns.json index c871e27..fbde262 100644 --- a/proxy-dns.json +++ b/proxy-dns.json @@ -55,7 +55,7 @@ ], "ENVS": [ ], - "EXTRA": "null", + "EXTRA": "--restart unless-stopped", "DEPEND": "null", "START_ON_BOOT": "true", "CMD": "null", diff --git a/smarthost-proxy-scheduler.json b/smarthost-proxy-scheduler.json index 21f4e2a..ef2ab0b 100644 --- a/smarthost-proxy-scheduler.json +++ b/smarthost-proxy-scheduler.json @@ -56,7 +56,7 @@ "ENVS": [ ], "ENV_FILES": [ "/etc/system/config/proxy.json" ], - "EXTRA": "null", + "EXTRA": "--restart unless-stopped", "DEPEND": "null", "START_ON_BOOT": "true", "CMD": "null", diff --git a/smarthost-proxy.json b/smarthost-proxy.json index 1ece990..4f20b72 100644 --- a/smarthost-proxy.json +++ b/smarthost-proxy.json @@ -82,8 +82,8 @@ "DEPEND": [ "proxy-dns" ], "START_ON_BOOT": "true", "CMD": "null", - "PRE_START": [ "firewall_dns-behbeq37th" ], - "POST_START": [ "firewall-smarhost-loadbalancer" ] + "PRE_START": [ "firewall-dns" ], + "POST_START": [ "firewall-letsencrypt", "firewall-smarhost-loadbalancer" ] }, { "IMAGE": "registry.format.hu/nginx:1.21",