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

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

View File

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

View File

@@ -38,21 +38,44 @@
"TYPE": "ro"
}
],
"PORTS": [ ],
"PORTS": [],
"READYNESS": [
{"tcp": ""},
{"HTTP": ""},
{"EXEC": "/ready.sh"}
{
"tcp": ""
},
{
"HTTP": ""
},
{
"EXEC": "/ready.sh"
}
],
"ENVS": [
{ "NSENTER": "true" },
{ "POSTROUTING": "true" },
{ "NAME": "NAME", "VALUE": "wireguardproxy" },
{ "TARGET": "smarthostloadbalancer" },
{ "TYPE": "tcp" },
{ "TARGET_PORT_1": "80" },
{ "TARGET_PORT_2": "443" },
{ "COMMENT": "client" }
{
"NSENTER": "true"
},
{
"POSTROUTING": "true"
},
{
"NAME": "NAME",
"VALUE": "wireguardproxy"
},
{
"TARGET": "smarthostloadbalancer"
},
{
"TYPE": "tcp"
},
{
"TARGET_PORT_1": "80"
},
{
"TARGET_PORT_2": "443"
},
{
"COMMENT": "client"
}
],
"EXTRA": "--privileged --rm",
"DEPEND": "null",

View File

@@ -38,26 +38,57 @@
"TYPE": "ro"
}
],
"PORTS": [ ],
"PORTS": [],
"READYNESS": [
{"tcp": ""},
{"HTTP": ""},
{"EXEC": "/ready.sh"}
{
"tcp": ""
},
{
"HTTP": ""
},
{
"EXEC": "/ready.sh"
}
],
"ENVS": [
{ "NSENTER": "true" },
{ "PREROUTING": "true" },
{ "SOURCE_IFACE": "wg0" },
{ "TARGET": "smarthostloadbalancer" },
{ "NAME": "NAME", "VALUE": "wireguardproxy" },
{ "TYPE": "tcp" },
{ "SOURCE_PORT_1": "80" },
{ "SOURCE_PORT_2": "443" },
{ "TARGET_PORT_1": "80" },
{ "TARGET_PORT_2": "443" },
{ "COMMENT": "client" }
{
"NSENTER": "true"
},
{
"PREROUTING": "true"
},
{
"SOURCE_IFACE": "wg0"
},
{
"TARGET": "smarthostloadbalancer"
},
{
"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"
],
"ENV_FILES": [ "/etc/user/config/user.json" ],
"EXTRA": "--privileged --rm",
"DEPEND": "null",
"START_ON_BOOT": "false",

View File

@@ -33,20 +33,40 @@
"TYPE": "rw"
}
],
"PORTS": [ ],
"PORTS": [],
"READYNESS": [
{"tcp": ""},
{"HTTP": ""},
{"EXEC": "/ready.sh"}
{
"tcp": ""
},
{
"HTTP": ""
},
{
"EXEC": "/ready.sh"
}
],
"ENVS": [
{ "CHAIN": "DOCKER-USER" },
{ "SOURCE": "proxyvpnclient" },
{ "TARGET": "smarthostloadbalancer" },
{ "TYPE": "tcp" },
{ "TARGET_PORT_1": "80" },
{ "TARGET_PORT_2": "443" },
{ "COMMENT": "vpn access smarthost loadbalancer" }
{
"CHAIN": "DOCKER-USER"
},
{
"SOURCE": "wireguardproxy"
},
{
"TARGET": "smarthostloadbalancer"
},
{
"TYPE": "tcp"
},
{
"TARGET_PORT_1": "80"
},
{
"TARGET_PORT_2": "443"
},
{
"COMMENT": "vpn access smarthost loadbalancer"
}
],
"EXTRA": "--privileged --rm",
"DEPEND": "null",

View File

@@ -9,7 +9,7 @@
"UPDATE": "true",
"NAME": "wireguardproxy-client",
"MEMORY": "64M",
"SELECTOR": "proxyvpnclient",
"SELECTOR": "wireguardproxy",
"VOLUMES": [
{
"SOURCE": "/etc/user/secret/vpn-proxy/wg0.conf",
@@ -17,11 +17,17 @@
"TYPE": "ro"
}
],
"PORTS": [ ],
"PORTS": [],
"READYNESS": [
{"tcp": ""},
{"HTTP": ""},
{"EXEC": "/ready.sh"}
{
"tcp": ""
},
{
"HTTP": ""
},
{
"EXEC": "/ready.sh"
}
],
"ENVS": "null",
"EXTRA": "--restart unless-stopped --privileged --cap-add=NET_ADMIN --device=/dev/net/tun --cap-add MKNOD --cap-add NET_RAW",
@@ -29,11 +35,11 @@
"START_ON_BOOT": "true",
"CMD": "null",
"PRE_START": "null",
"POST_START": [ "firewall-vpn-smarthost-loadbalancer",
"POST_START": [
"firewall-vpn-smarthost-loadbalancer",
"firewall-vpn-proxy-postrouting",
"firewall-vpn-proxy-prerouting"
]
}
]
}