update letsencrypt and firewall configurations to use 'safebox' registry and improve formatting

This commit is contained in:
gyurix
2025-03-05 23:05:39 +01:00
parent 4f048de3bc
commit 3dded502e7
4 changed files with 249 additions and 211 deletions

View File

@@ -5,7 +5,7 @@
},
"containers": [
{
"IMAGE": "registry.format.hu/firewall",
"IMAGE": "safebox/firewall",
"NAME": "firewall",
"MEMORY": "64M",
"NETWORK": "host",
@@ -29,17 +29,35 @@
],
"PORTS": [],
"READYNESS": [
{"tcp": ""},
{"HTTP": ""},
{"EXEC": "/ready.sh"}
{
"tcp": ""
},
{
"HTTP": ""
},
{
"EXEC": "/ready.sh"
}
],
"ENVS": [
{ "CHAIN": "DOCKER-USER" },
{ "SOURCE": "smarthostloadbalancer" },
{ "TARGET": "letsencrypt" },
{ "TYPE": "tcp" },
{ "TARGET_PORT": "80" },
{ "COMMENT": "letsencrypt" }
{
"CHAIN": "DOCKER-USER"
},
{
"SOURCE": "smarthostloadbalancer"
},
{
"TARGET": "letsencrypt"
},
{
"TYPE": "tcp"
},
{
"TARGET_PORT": "80"
},
{
"COMMENT": "letsencrypt"
}
],
"EXTRA": "--privileged --rm",
"DEPEND": "null",

View File

@@ -14,7 +14,7 @@
],
"containers": [
{
"IMAGE": "registry.format.hu/letsencrypt",
"IMAGE": "safebox/letsencrypt",
"NAME": "letsencrypt",
"MEMORY": "64M",
"IP": "172.18.254.254",
@@ -32,18 +32,28 @@
}
],
"PORTS": [],
"ENV_FILES": [ "/etc/user/config/user.json" ],
"ENV_FILES": [
"/etc/user/config/user.json"
],
"READYNESS": [
{"tcp": ""},
{"HTTP": ""},
{"EXEC": "/ready.sh"}
{
"tcp": ""
},
{
"HTTP": ""
},
{
"EXEC": "/ready.sh"
}
],
"EXTRA": "",
"DEPEND": "null",
"START_ON_BOOT": "false",
"CMD": "null",
"PRE_START": "null",
"POST_START": [ "firewall-29eexhrh" ]
"POST_START": [
"firewall-letsencrypt"
]
}
]
}

View File

@@ -5,7 +5,7 @@
},
"containers": [
{
"IMAGE": "registry.format.hu/proxy-scheduler:latest",
"IMAGE": "safebox/proxy-scheduler:latest",
"NAME": "proxy_scheduler-ifhiwhhg",
"MEMORY": "64M",
"IP": "null",
@@ -49,15 +49,25 @@
],
"PORTS": [],
"READYNESS": [
{"tcp": ""},
{"HTTP": ""},
{"EXEC": "/ready.sh"}
{
"tcp": ""
},
{
"HTTP": ""
},
{
"EXEC": "/ready.sh"
}
],
"ENVS": [
"ENVS": [],
"ENV_FILES": [
"/etc/system/config/proxy.json"
],
"ENV_FILES": [ "/etc/system/config/proxy.json" ],
"EXTRA": "null",
"DEPEND": [ "public-proxy.networks.loadbalancer", "public-proxy.containers.loadbalancer-27dhuwdh" ],
"DEPEND": [
"public-proxy.networks.loadbalancer",
"public-proxy.containers.loadbalancer-27dhuwdh"
],
"START_ON_BOOT": "true",
"CMD": "null",
"PRE_START": "null",

View File

@@ -20,7 +20,7 @@
"COMMENT": "edeg3e98"
},
"proxy_scheduler": {
"DOCKER_REGISTRY_URL": "registry.format.hu",
"DOCKER_REGISTRY_URL": "safebox",
"CERT_DIR": "/keys",
"DOMAIN_DIR": "/domains",
"PROXY_SERVICE_FILE": "public-proxy.json",
@@ -32,7 +32,7 @@
"SERVICE_NAME": "public-proxy"
},
"proxy_scheduler_local": {
"DOCKER_REGISTRY_URL": "registry.format.hu",
"DOCKER_REGISTRY_URL": "safebox",
"PROXY_TYPE": "",
"GENERATE_CERTIFICATE": "true",
"LETSENCRYPT_URL": "letsencrypt.org",