safebox/proxy-scheduler
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: safebox:86d57693f6579deda8b04613ed5cd17b155aca31
Branches Tags
safebox:master
...
compare: safebox:ba3be0fbd05bba21121ed021a9aea93fa0de6a59
Branches Tags
safebox:master

2 Commits
86d57693f6 ... ba3be0fbd0

Author SHA1 Message Date
gyurix
ba3be0fbd0 merged
All checks were successful
continuous-integration/drone/push Build is passing
Details 
Merge branch 'master' of https://git.format.hu/format/proxy-scheduler
 2025-03-05 23:06:03 +01:00
gyurix
3dded502e7 update letsencrypt and firewall configurations to use 'safebox' registry and improve formatting 2025-03-05 23:05:39 +01:00
4 changed files with 249 additions and 211 deletions
Expand all files Collapse all files

120
firewall-letsencrypt.json
View File

@@ -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"
}
]
}

106
letsencrypt.json
View File

@@ -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"
]
}
]
}

138
proxy-scheduler.json
View File

@@ -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"
}
]
}

96
proxy.json
View File

@@ -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"
}
}