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

Update .drone.yml and JSON configuration files for service adjustments
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
gyurix
2025-03-05 21:58:15 +01:00
parent 025b8c1bb4
commit f44dd33f71
5 changed files with 309 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.drone.yml
View File

@@ -3,7 +3,7 @@ type: kubernetes
name: default name: default
node_selector: node_selector:
physical-node: dev2 physical-node: dev1
trigger: trigger:
branch: branch:

151
firewall-vpn-proxy-postrouting.json
View File

@@ -1,65 +1,88 @@
{ {
"main": { "main": {
"SERVICE_NAME": "firewalls", "SERVICE_NAME": "firewalls",
"DOMAIN": "null" "DOMAIN": "null"
}, },
"containers": [ "containers": [
{ {
"IMAGE": "registry.format.hu/firewall", "IMAGE": "registry.format.hu/firewall",
"UPDATE": "true", "UPDATE": "true",
"NAME": "firewall", "NAME": "firewall",
"SCALE": "0", "SCALE": "0",
"MEMORY": "64M", "MEMORY": "64M",
"NETWORK": "host", "NETWORK": "host",
"VOLUMES": [ "VOLUMES": [
{ {
"SOURCE": "/proc/", "SOURCE": "/proc/",
"DEST": "/proc/", "DEST": "/proc/",
"TYPE": "rw" "TYPE": "rw"
}, },
{ {
"SOURCE": "/run/", "SOURCE": "/run/",
"DEST": "/run/", "DEST": "/run/",
"TYPE": "rw" "TYPE": "rw"
}, },
{ {
"SOURCE": "/etc/user/config/services", "SOURCE": "/etc/user/config/services",
"DEST": "/services", "DEST": "/services",
"TYPE": "ro" "TYPE": "ro"
}, },
{ {
"SOURCE": "/var/run/docker.sock", "SOURCE": "/var/run/docker.sock",
"DEST": "/var/run/docker.sock", "DEST": "/var/run/docker.sock",
"TYPE": "rw" "TYPE": "rw"
}, },
{ {
"SOURCE": "/etc/system/data/dns/hosts.local", "SOURCE": "/etc/system/data/dns/hosts.local",
"DEST": "/etc/dns/hosts.local", "DEST": "/etc/dns/hosts.local",
"TYPE": "ro" "TYPE": "ro"
} }
], ],
"PORTS": [ ], "PORTS": [],
"READYNESS": [ "READYNESS": [
{"tcp": ""}, {
{"HTTP": ""}, "tcp": ""
{"EXEC": "/ready.sh"} },
], {
"ENVS": [ "HTTP": ""
{ "NSENTER": "true" }, },
{ "POSTROUTING": "true" }, {
{ "NAME": "NAME", "VALUE": "wireguardproxy" }, "EXEC": "/ready.sh"
{ "TARGET": "smarthostloadbalancer" }, }
{ "TYPE": "tcp" }, ],
{ "TARGET_PORT_1": "80" }, "ENVS": [
{ "TARGET_PORT_2": "443" }, {
{ "COMMENT": "client" } "NSENTER": "true"
], },
"EXTRA": "--privileged --rm", {
"DEPEND": "null", "POSTROUTING": "true"
"START_ON_BOOT": "false", },
"CMD": "null", {
"PRE_START": "null", "NAME": "NAME",
"POST_START": "null" "VALUE": "wireguardproxy"
} },
] {
} "TARGET": "smarthostloadbalancer"
},
{
"TYPE": "tcp"
},
{
"TARGET_PORT_1": "80"
},
{
"TARGET_PORT_2": "443"
},
{
"COMMENT": "client"
}
],
"EXTRA": "--privileged --rm",
"DEPEND": "null",
"START_ON_BOOT": "false",
"CMD": "null",
"PRE_START": "null",
"POST_START": "null"
}
]
}

167
firewall-vpn-proxy-prerouting.json
View File

@@ -1,69 +1,100 @@
{ {
"main": { "main": {
"SERVICE_NAME": "firewalls", "SERVICE_NAME": "firewalls",
"DOMAIN": "null" "DOMAIN": "null"
}, },
"containers": [ "containers": [
{ {
"IMAGE": "registry.format.hu/firewall", "IMAGE": "registry.format.hu/firewall",
"UPDATE": "true", "UPDATE": "true",
"NAME": "wireguardfirewall", "NAME": "wireguardfirewall",
"SCALE": "0", "SCALE": "0",
"MEMORY": "64M", "MEMORY": "64M",
"NETWORK": "host", "NETWORK": "host",
"VOLUMES": [ "VOLUMES": [
{ {
"SOURCE": "/proc/", "SOURCE": "/proc/",
"DEST": "/proc/", "DEST": "/proc/",
"TYPE": "rw" "TYPE": "rw"
}, },
{ {
"SOURCE": "/run/", "SOURCE": "/run/",
"DEST": "/run/", "DEST": "/run/",
"TYPE": "rw" "TYPE": "rw"
}, },
{ {
"SOURCE": "/etc/user/config/services", "SOURCE": "/etc/user/config/services",
"DEST": "/services", "DEST": "/services",
"TYPE": "ro" "TYPE": "ro"
}, },
{ {
"SOURCE": "/var/run/docker.sock", "SOURCE": "/var/run/docker.sock",
"DEST": "/var/run/docker.sock", "DEST": "/var/run/docker.sock",
"TYPE": "rw" "TYPE": "rw"
}, },
{ {
"SOURCE": "/etc/system/data/dns/hosts.local", "SOURCE": "/etc/system/data/dns/hosts.local",
"DEST": "/etc/dns/hosts.local", "DEST": "/etc/dns/hosts.local",
"TYPE": "ro" "TYPE": "ro"
} }
], ],
"PORTS": [ ], "PORTS": [],
"READYNESS": [ "READYNESS": [
{"tcp": ""}, {
{"HTTP": ""}, "tcp": ""
{"EXEC": "/ready.sh"} },
], {
"ENVS": [ "HTTP": ""
{ "NSENTER": "true" }, },
{ "PREROUTING": "true" }, {
{ "SOURCE_IFACE": "wg0" }, "EXEC": "/ready.sh"
{ "TARGET": "smarthostloadbalancer" }, }
{ "NAME": "NAME", "VALUE": "wireguardproxy" }, ],
{ "TYPE": "tcp" }, "ENVS": [
{ "SOURCE_PORT_1": "80" }, {
{ "SOURCE_PORT_2": "443" }, "NSENTER": "true"
{ "TARGET_PORT_1": "80" }, },
{ "TARGET_PORT_2": "443" }, {
{ "COMMENT": "client" } "PREROUTING": "true"
], },
"ENV_FILES": [ "/etc/user/config/user.json" ], {
"EXTRA": "--privileged --rm", "SOURCE_IFACE": "wg0"
"DEPEND": "null", },
"START_ON_BOOT": "false", {
"CMD": "null", "TARGET": "smarthostloadbalancer"
"PRE_START": "null", },
"POST_START": "null" {
} "NAME": "NAME",
] "VALUE": "wireguardproxy"
} },
{
"TYPE": "tcp"
},
{
"SOURCE_PORT_1": "80"
},
{
"SOURCE_PORT_2": "443"
},
{
"TARGET_PORT_1": "80"
},
{
"TARGET_PORT_2": "443"
},
{
"COMMENT": "client"
}
],
"ENV_FILES": [
"/etc/user/config/user.json"
],
"EXTRA": "--privileged --rm",
"DEPEND": "null",
"START_ON_BOOT": "false",
"CMD": "null",
"PRE_START": "null",
"POST_START": "null"
}
]
}

136
firewall-vpn-smarthost-loadbalancer.json
View File

@@ -1,59 +1,79 @@
{ {
"main": { "main": {
"SERVICE_NAME": "firewalls", "SERVICE_NAME": "firewalls",
"DOMAIN": "null" "DOMAIN": "null"
}, },
"containers": [ "containers": [
{ {
"IMAGE": "registry.format.hu/firewall", "IMAGE": "registry.format.hu/firewall",
"UPDATE": "true", "UPDATE": "true",
"NAME": "firewall", "NAME": "firewall",
"MEMORY": "64M", "MEMORY": "64M",
"NETWORK": "host", "NETWORK": "host",
"SCALE": "0", "SCALE": "0",
"VOLUMES": [ "VOLUMES": [
{ {
"SOURCE": "/run/", "SOURCE": "/run/",
"DEST": "/run/", "DEST": "/run/",
"TYPE": "rw" "TYPE": "rw"
}, },
{ {
"SOURCE": "/etc/user/config/services", "SOURCE": "/etc/user/config/services",
"DEST": "/services", "DEST": "/services",
"TYPE": "ro" "TYPE": "ro"
}, },
{ {
"SOURCE": "/etc/system/data/dns/hosts.local", "SOURCE": "/etc/system/data/dns/hosts.local",
"DEST": "/etc/dns/hosts.local", "DEST": "/etc/dns/hosts.local",
"TYPE": "ro" "TYPE": "ro"
}, },
{ {
"SOURCE": "/var/run/docker.sock", "SOURCE": "/var/run/docker.sock",
"DEST": "/var/run/docker.sock", "DEST": "/var/run/docker.sock",
"TYPE": "rw" "TYPE": "rw"
} }
], ],
"PORTS": [ ], "PORTS": [],
"READYNESS": [ "READYNESS": [
{"tcp": ""}, {
{"HTTP": ""}, "tcp": ""
{"EXEC": "/ready.sh"} },
], {
"ENVS": [ "HTTP": ""
{ "CHAIN": "DOCKER-USER" }, },
{ "SOURCE": "proxyvpnclient" }, {
{ "TARGET": "smarthostloadbalancer" }, "EXEC": "/ready.sh"
{ "TYPE": "tcp" }, }
{ "TARGET_PORT_1": "80" }, ],
{ "TARGET_PORT_2": "443" }, "ENVS": [
{ "COMMENT": "vpn access smarthost loadbalancer" } {
], "CHAIN": "DOCKER-USER"
"EXTRA": "--privileged --rm", },
"DEPEND": "null", {
"START_ON_BOOT": "false", "SOURCE": "wireguardproxy"
"CMD": "null", },
"PRE_START": "null", {
"POST_START": "null" "TARGET": "smarthostloadbalancer"
} },
] {
} "TYPE": "tcp"
},
{
"TARGET_PORT_1": "80"
},
{
"TARGET_PORT_2": "443"
},
{
"COMMENT": "vpn access smarthost loadbalancer"
}
],
"EXTRA": "--privileged --rm",
"DEPEND": "null",
"START_ON_BOOT": "false",
"CMD": "null",
"PRE_START": "null",
"POST_START": "null"
}
]
}

82
vpn-proxy.json
View File

@@ -1,39 +1,45 @@
{ {
"main": { "main": {
"SERVICE_NAME": "wireguard-client", "SERVICE_NAME": "wireguard-client",
"DOMAIN": "null" "DOMAIN": "null"
}, },
"containers": [ "containers": [
{ {
"IMAGE": "registry.format.hu/wireguard-proxy-client", "IMAGE": "registry.format.hu/wireguard-proxy-client",
"UPDATE": "true", "UPDATE": "true",
"NAME": "wireguardproxy-client", "NAME": "wireguardproxy-client",
"MEMORY": "64M", "MEMORY": "64M",
"SELECTOR": "proxyvpnclient", "SELECTOR": "wireguardproxy",
"VOLUMES": [ "VOLUMES": [
{ {
"SOURCE": "/etc/user/secret/vpn-proxy/wg0.conf", "SOURCE": "/etc/user/secret/vpn-proxy/wg0.conf",
"DEST": "/etc/wireguard/wg0.conf", "DEST": "/etc/wireguard/wg0.conf",
"TYPE": "ro" "TYPE": "ro"
} }
], ],
"PORTS": [ ], "PORTS": [],
"READYNESS": [ "READYNESS": [
{"tcp": ""}, {
{"HTTP": ""}, "tcp": ""
{"EXEC": "/ready.sh"} },
], {
"ENVS": "null", "HTTP": ""
"EXTRA": "--restart unless-stopped --privileged --cap-add=NET_ADMIN --device=/dev/net/tun --cap-add MKNOD --cap-add NET_RAW", },
"DEPEND": "null", {
"START_ON_BOOT": "true", "EXEC": "/ready.sh"
"CMD": "null", }
"PRE_START": "null", ],
"POST_START": [ "firewall-vpn-smarthost-loadbalancer", "ENVS": "null",
"firewall-vpn-proxy-postrouting", "EXTRA": "--restart unless-stopped --privileged --cap-add=NET_ADMIN --device=/dev/net/tun --cap-add MKNOD --cap-add NET_RAW",
"firewall-vpn-proxy-prerouting" "DEPEND": "null",
] "START_ON_BOOT": "true",
} "CMD": "null",
] "PRE_START": "null",
} "POST_START": [
"firewall-vpn-smarthost-loadbalancer",
"firewall-vpn-proxy-postrouting",
"firewall-vpn-proxy-prerouting"
]
}
]
}