mirror of
https://github.com/community-scripts/ProxmoxVED.git
synced 2026-04-05 08:54:03 -04:00
Update build target, add /gluetun link & env
Switch the Go build invocation to target the cmd/gluetun package directory (./cmd/gluetun/) in both ct/gluetun.sh and install/gluetun-install.sh, and ensure modules are downloaded during install (go mod download). In the installer, create /opt/gluetun-data and add a symlink /gluetun -> /opt/gluetun-data, update STORAGE/PUBLICIP/PORT file paths to use /gluetun, add PPROF_ENABLED=no to the default .env, and add UnsetEnvironment=USER to the systemd unit to avoid inheriting the USER environment. These changes standardize build behavior and relocate runtime data to a consistent /gluetun path.
This commit is contained in:
@@ -40,7 +40,7 @@ function update_script() {
|
|||||||
msg_info "Building Gluetun"
|
msg_info "Building Gluetun"
|
||||||
cd /opt/gluetun
|
cd /opt/gluetun
|
||||||
$STD go mod download
|
$STD go mod download
|
||||||
CGO_ENABLED=0 $STD go build -trimpath -ldflags="-s -w" -o /usr/local/bin/gluetun cmd/gluetun/main.go
|
CGO_ENABLED=0 $STD go build -trimpath -ldflags="-s -w" -o /usr/local/bin/gluetun ./cmd/gluetun/
|
||||||
msg_ok "Built Gluetun"
|
msg_ok "Built Gluetun"
|
||||||
|
|
||||||
msg_info "Starting Service"
|
msg_info "Starting Service"
|
||||||
|
|||||||
@@ -32,11 +32,13 @@ fetch_and_deploy_gh_release "gluetun" "qdm12/gluetun" "tarball"
|
|||||||
|
|
||||||
msg_info "Building Gluetun"
|
msg_info "Building Gluetun"
|
||||||
cd /opt/gluetun
|
cd /opt/gluetun
|
||||||
CGO_ENABLED=0 $STD go build -trimpath -ldflags="-s -w" -o /usr/local/bin/gluetun cmd/gluetun/main.go
|
$STD go mod download
|
||||||
|
CGO_ENABLED=0 $STD go build -trimpath -ldflags="-s -w" -o /usr/local/bin/gluetun ./cmd/gluetun/
|
||||||
msg_ok "Built Gluetun"
|
msg_ok "Built Gluetun"
|
||||||
|
|
||||||
msg_info "Configuring Gluetun"
|
msg_info "Configuring Gluetun"
|
||||||
mkdir -p /opt/gluetun-data
|
mkdir -p /opt/gluetun-data
|
||||||
|
ln -sf /opt/gluetun-data /gluetun
|
||||||
cat <<EOF >/opt/gluetun-data/.env
|
cat <<EOF >/opt/gluetun-data/.env
|
||||||
VPN_SERVICE_PROVIDER=custom
|
VPN_SERVICE_PROVIDER=custom
|
||||||
VPN_TYPE=openvpn
|
VPN_TYPE=openvpn
|
||||||
@@ -46,13 +48,14 @@ OPENVPN_PASSWORD=
|
|||||||
HTTP_CONTROL_SERVER_ADDRESS=:8000
|
HTTP_CONTROL_SERVER_ADDRESS=:8000
|
||||||
HTTPPROXY=off
|
HTTPPROXY=off
|
||||||
SHADOWSOCKS=off
|
SHADOWSOCKS=off
|
||||||
|
PPROF_ENABLED=no
|
||||||
FIREWALL_ENABLED_DISABLING_IT_SHOOTS_YOU_IN_YOUR_FOOT=on
|
FIREWALL_ENABLED_DISABLING_IT_SHOOTS_YOU_IN_YOUR_FOOT=on
|
||||||
HEALTH_SERVER_ADDRESS=127.0.0.1:9999
|
HEALTH_SERVER_ADDRESS=127.0.0.1:9999
|
||||||
DNS_UPSTREAM_RESOLVERS=cloudflare
|
DNS_UPSTREAM_RESOLVERS=cloudflare
|
||||||
LOG_LEVEL=info
|
LOG_LEVEL=info
|
||||||
STORAGE_FILEPATH=/opt/gluetun-data/servers.json
|
STORAGE_FILEPATH=/gluetun/servers.json
|
||||||
PUBLICIP_FILE=/opt/gluetun-data/ip
|
PUBLICIP_FILE=/gluetun/ip
|
||||||
VPN_PORT_FORWARDING_STATUS_FILE=/opt/gluetun-data/forwarded_port
|
VPN_PORT_FORWARDING_STATUS_FILE=/gluetun/forwarded_port
|
||||||
TZ=UTC
|
TZ=UTC
|
||||||
EOF
|
EOF
|
||||||
msg_ok "Configured Gluetun"
|
msg_ok "Configured Gluetun"
|
||||||
@@ -68,6 +71,7 @@ Type=simple
|
|||||||
User=root
|
User=root
|
||||||
WorkingDirectory=/opt/gluetun-data
|
WorkingDirectory=/opt/gluetun-data
|
||||||
EnvironmentFile=/opt/gluetun-data/.env
|
EnvironmentFile=/opt/gluetun-data/.env
|
||||||
|
UnsetEnvironment=USER
|
||||||
ExecStart=/usr/local/bin/gluetun
|
ExecStart=/usr/local/bin/gluetun
|
||||||
Restart=on-failure
|
Restart=on-failure
|
||||||
RestartSec=5
|
RestartSec=5
|
||||||
|
|||||||
Reference in New Issue
Block a user