diff --git a/firewall-letsencrypt.json b/firewall-letsencrypt.json index a26862b..a8e838d 100644 --- a/firewall-letsencrypt.json +++ b/firewall-letsencrypt.json @@ -1,52 +1,70 @@ { - "main": { - "SERVICE_NAME": "firewalls", - "DOMAIN": "null" - }, - "containers": [ - { - "IMAGE": "registry.format.hu/firewall", - "NAME": "firewall", - "MEMORY": "64M", - "NETWORK": "host", - "SCALE": "0", - "VOLUMES": [ - { - "SOURCE": "/run/", - "DEST": "/run/", - "TYPE": "rw" - }, - { - "SOURCE": "/etc/user/config/services", - "DEST": "/services", - "TYPE": "ro" - }, - { - "SOURCE": "/etc/system/data/dns/hosts.local", - "DEST": "/etc/dns/hosts.local", - "TYPE": "ro" - } - ], - "PORTS": [ ], - "READYNESS": [ - {"tcp": ""}, - {"HTTP": ""}, - {"EXEC": "/ready.sh"} - ], - "ENVS": [ - { "CHAIN": "DOCKER-USER" }, - { "SOURCE": "smarthostloadbalancer" }, - { "TARGET": "letsencrypt" }, - { "TYPE": "tcp" }, - { "TARGET_PORT": "80" }, - { "COMMENT": "letsencrypt" } - ], - "EXTRA": "--privileged --rm", - "DEPEND": "null", - "START_ON_BOOT": "false", - "CMD": "null", - "PRE_START": "null", - "POST_START": "null" - } - ] -} + "main": { + "SERVICE_NAME": "firewalls", + "DOMAIN": "null" + }, + "containers": [ + { + "IMAGE": "safebox/firewall", + "NAME": "firewall", + "MEMORY": "64M", + "NETWORK": "host", + "SCALE": "0", + "VOLUMES": [ + { + "SOURCE": "/run/", + "DEST": "/run/", + "TYPE": "rw" + }, + { + "SOURCE": "/etc/user/config/services", + "DEST": "/services", + "TYPE": "ro" + }, + { + "SOURCE": "/etc/system/data/dns/hosts.local", + "DEST": "/etc/dns/hosts.local", + "TYPE": "ro" + } + ], + "PORTS": [], + "READYNESS": [ + { + "tcp": "" + }, + { + "HTTP": "" + }, + { + "EXEC": "/ready.sh" + } + ], + "ENVS": [ + { + "CHAIN": "DOCKER-USER" + }, + { + "SOURCE": "smarthostloadbalancer" + }, + { + "TARGET": "letsencrypt" + }, + { + "TYPE": "tcp" + }, + { + "TARGET_PORT": "80" + }, + { + "COMMENT": "letsencrypt" + } + ], + "EXTRA": "--privileged --rm", + "DEPEND": "null", + "START_ON_BOOT": "false", + "CMD": "null", + "PRE_START": "null", + "POST_START": "null" + } + ] +} \ No newline at end of file diff --git a/letsencrypt.json b/letsencrypt.json index eaf9602..59ac098 100644 --- a/letsencrypt.json +++ b/letsencrypt.json @@ -1,49 +1,59 @@ { - "main": { - "SERVICE_NAME": "letsencrypt", - "DOMAIN": "null" - }, - "networks": [ - { - "NAME": "letsencrypt", - "DRIVER": "bridge", - "SUBNET": "172.18.254.0/24", - "RANGE": "172.18.254.0/24", - "GATEWAY": "172.18.254.1" - } - ], - "containers": [ - { - "IMAGE": "registry.format.hu/letsencrypt", - "NAME": "letsencrypt", - "MEMORY": "64M", - "IP": "172.18.254.254", - "NETWORK": "letsencrypt", - "VOLUMES": [ - { - "SOURCE": "/etc/system/ssl/keys/", - "DEST": "/acme.sh/", - "TYPE": "rw" - }, - { - "SOURCE": "/etc/user/config/domains", - "DEST": "/domains", - "TYPE": "ro" - } - ], - "PORTS": [ ], - "ENV_FILES": [ "/etc/user/config/user.json" ], - "READYNESS": [ - {"tcp": ""}, - {"HTTP": ""}, - {"EXEC": "/ready.sh"} - ], - "EXTRA": "", - "DEPEND": "null", - "START_ON_BOOT": "false", - "CMD": "null", - "PRE_START": "null", - "POST_START": [ "firewall-29eexhrh" ] - } - ] -} + "main": { + "SERVICE_NAME": "letsencrypt", + "DOMAIN": "null" + }, + "networks": [ + { + "NAME": "letsencrypt", + "DRIVER": "bridge", + "SUBNET": "172.18.254.0/24", + "RANGE": "172.18.254.0/24", + "GATEWAY": "172.18.254.1" + } + ], + "containers": [ + { + "IMAGE": "safebox/letsencrypt", + "NAME": "letsencrypt", + "MEMORY": "64M", + "IP": "172.18.254.254", + "NETWORK": "letsencrypt", + "VOLUMES": [ + { + "SOURCE": "/etc/system/ssl/keys/", + "DEST": "/acme.sh/", + "TYPE": "rw" + }, + { + "SOURCE": "/etc/user/config/domains", + "DEST": "/domains", + "TYPE": "ro" + } + ], + "PORTS": [], + "ENV_FILES": [ + "/etc/user/config/user.json" + ], + "READYNESS": [ + { + "tcp": "" + }, + { + "HTTP": "" + }, + { + "EXEC": "/ready.sh" + } + ], + "EXTRA": "", + "DEPEND": "null", + "START_ON_BOOT": "false", + "CMD": "null", + "PRE_START": "null", + "POST_START": [ + "firewall-letsencrypt" + ] + } + ] +} \ No newline at end of file diff --git a/proxy-scheduler.json b/proxy-scheduler.json index 7faa251..44d9259 100644 --- a/proxy-scheduler.json +++ b/proxy-scheduler.json @@ -1,67 +1,77 @@ { - "main": { - "SERVICE_NAME": "proxy-scheduler", - "DOMAIN": "null" - }, - "containers": [ + "main": { + "SERVICE_NAME": "proxy-scheduler", + "DOMAIN": "null" + }, + "containers": [ + { + "IMAGE": "safebox/proxy-scheduler:latest", + "NAME": "proxy_scheduler-ifhiwhhg", + "MEMORY": "64M", + "IP": "null", + "NETWORK": "host", + "VOLUMES": [ { - "IMAGE": "registry.format.hu/proxy-scheduler:latest", - "NAME": "proxy_scheduler-ifhiwhhg", - "MEMORY": "64M", - "IP": "null", - "NETWORK": "host", - "VOLUMES": [ - { - "SOURCE": "/etc/user/config/services", - "DEST": "/etc/user/config/services", - "TYPE": "rw" - }, - { - "SOURCE": "/etc/user/config/domains", - "DEST": "/domains", - "TYPE": "ro" - }, - { - "SOURCE": "/etc/system/data/ssl/keys", - "DEST": "/keys", - "TYPE": "rw" - }, - { - "SOURCE": "/etc/system/data/ssl/certs/", - "DEST": "/etc/ssl/certs/", - "TYPE": "ro" - }, - { - "SOURCE": "/etc/system/config/public-proxy/nginx", - "DEST": "/proxy_config", - "TYPE": "rw" - }, - { - "SOURCE": "/etc/user/config/services/public-proxy.json", - "DEST": "/public-proxy.json", - "TYPE": "ro" - }, - { - "SOURCE": "/var/run/docker.sock", - "DEST": "/var/run/docker.sock", - "TYPE": "rw" - } - ], - "PORTS": [ ], - "READYNESS": [ - {"tcp": ""}, - {"HTTP": ""}, - {"EXEC": "/ready.sh"} - ], - "ENVS": [ - ], - "ENV_FILES": [ "/etc/system/config/proxy.json" ], - "EXTRA": "null", - "DEPEND": [ "public-proxy.networks.loadbalancer", "public-proxy.containers.loadbalancer-27dhuwdh" ], - "START_ON_BOOT": "true", - "CMD": "null", - "PRE_START": "null", - "POST_START": "null" + "SOURCE": "/etc/user/config/services", + "DEST": "/etc/user/config/services", + "TYPE": "rw" + }, + { + "SOURCE": "/etc/user/config/domains", + "DEST": "/domains", + "TYPE": "ro" + }, + { + "SOURCE": "/etc/system/data/ssl/keys", + "DEST": "/keys", + "TYPE": "rw" + }, + { + "SOURCE": "/etc/system/data/ssl/certs/", + "DEST": "/etc/ssl/certs/", + "TYPE": "ro" + }, + { + "SOURCE": "/etc/system/config/public-proxy/nginx", + "DEST": "/proxy_config", + "TYPE": "rw" + }, + { + "SOURCE": "/etc/user/config/services/public-proxy.json", + "DEST": "/public-proxy.json", + "TYPE": "ro" + }, + { + "SOURCE": "/var/run/docker.sock", + "DEST": "/var/run/docker.sock", + "TYPE": "rw" } - ] -} + ], + "PORTS": [], + "READYNESS": [ + { + "tcp": "" + }, + { + "HTTP": "" + }, + { + "EXEC": "/ready.sh" + } + ], + "ENVS": [], + "ENV_FILES": [ + "/etc/system/config/proxy.json" + ], + "EXTRA": "null", + "DEPEND": [ + "public-proxy.networks.loadbalancer", + "public-proxy.containers.loadbalancer-27dhuwdh" + ], + "START_ON_BOOT": "true", + "CMD": "null", + "PRE_START": "null", + "POST_START": "null" + } + ] +} \ No newline at end of file diff --git a/proxy.json b/proxy.json index 696b56f..ecda3e1 100644 --- a/proxy.json +++ b/proxy.json @@ -1,49 +1,49 @@ { - "firewall_loadbalancer_wireguard_prerouting": { - "NAME": "wireguard_proxy_client", - "PREROUTING": "true", - "TARGET_IP": "172.18.100.2", - "TYPE": "tcp", - "SOURCE_PORT_1": "80", - "SOURCE_PORT_2": "443", - "TARGET_PORT_1": "80", - "TARGET_PORT_2": "443", - "COMMENT": "edeg3e98" - }, - "firewall_loadbalancer_wireguard_postrouting": { - "NAME": "wireguard_proxy_client", - "POSTROUTING": "true", - "TARGET_IP": "172.18.100.0", - "TARGET_PORT_1": "80", - "TARGET_PORT_2": "443", - "TYPE": "tcp", - "COMMENT": "edeg3e98" - }, - "proxy_scheduler": { - "DOCKER_REGISTRY_URL": "registry.format.hu", - "CERT_DIR": "/keys", - "DOMAIN_DIR": "/domains", - "PROXY_SERVICE_FILE": "public-proxy.json", - "PROXY_CONFIG_DIR": "/proxy_config", - "PROXY_TYPE": "haproxy", - "TIMEOUT": "5", - "RESTART": "3", - "ROLE": "backend-proxy", - "SERVICE_NAME": "public-proxy" - }, - "proxy_scheduler_local": { - "DOCKER_REGISTRY_URL": "registry.format.hu", - "PROXY_TYPE": "", - "GENERATE_CERTIFICATE": "true", - "LETSENCRYPT_URL": "letsencrypt.org", - "LETSENCRYPT_SERVICE_NAME": "letsencrypt.json", - "CERT_DIR": "/keys", - "DOMAIN_DIR": "/domains", - "PROXY_SERVICE_FILE": "public-proxy.json", - "PROXY_CONFIG_DIR": "/proxy_config", - "TIMEOUT": "5", - "RESTART": "3", - "ROLE": "backend-proxy", - "SERVICE_NAME": "public-proxy" - } -} + "firewall_loadbalancer_wireguard_prerouting": { + "NAME": "wireguard_proxy_client", + "PREROUTING": "true", + "TARGET_IP": "172.18.100.2", + "TYPE": "tcp", + "SOURCE_PORT_1": "80", + "SOURCE_PORT_2": "443", + "TARGET_PORT_1": "80", + "TARGET_PORT_2": "443", + "COMMENT": "edeg3e98" + }, + "firewall_loadbalancer_wireguard_postrouting": { + "NAME": "wireguard_proxy_client", + "POSTROUTING": "true", + "TARGET_IP": "172.18.100.0", + "TARGET_PORT_1": "80", + "TARGET_PORT_2": "443", + "TYPE": "tcp", + "COMMENT": "edeg3e98" + }, + "proxy_scheduler": { + "DOCKER_REGISTRY_URL": "safebox", + "CERT_DIR": "/keys", + "DOMAIN_DIR": "/domains", + "PROXY_SERVICE_FILE": "public-proxy.json", + "PROXY_CONFIG_DIR": "/proxy_config", + "PROXY_TYPE": "haproxy", + "TIMEOUT": "5", + "RESTART": "3", + "ROLE": "backend-proxy", + "SERVICE_NAME": "public-proxy" + }, + "proxy_scheduler_local": { + "DOCKER_REGISTRY_URL": "safebox", + "PROXY_TYPE": "", + "GENERATE_CERTIFICATE": "true", + "LETSENCRYPT_URL": "letsencrypt.org", + "LETSENCRYPT_SERVICE_NAME": "letsencrypt.json", + "CERT_DIR": "/keys", + "DOMAIN_DIR": "/domains", + "PROXY_SERVICE_FILE": "public-proxy.json", + "PROXY_CONFIG_DIR": "/proxy_config", + "TIMEOUT": "5", + "RESTART": "3", + "ROLE": "backend-proxy", + "SERVICE_NAME": "public-proxy" + } +} \ No newline at end of file