From 482c3a7b2ee5a495efc9147150fa07d9dedba3e8 Mon Sep 17 00:00:00 2001 From: SachinAsus Date: Sun, 25 Feb 2024 14:03:24 +0530 Subject: [PATCH] working on daily --- src/config.js | 2 +- {wgsh => src/wgsh}/wg-post-down.sh.bak | 0 {wgsh => src/wgsh}/wg-post-up.sh | 0 {wgsh => src/wgsh}/wg-pre-down.sh | 0 {wgsh => src/wgsh}/wg-pre-up.sh | 0 {wgsh => src/wgsh}/wg0-post-up.sh | 13 ++++++------- .../wg0-post-down.sh => src/wgsh/wg0-pre-down.sh | 16 +++++++++++----- wg-easy.service | 2 +- 8 files changed, 19 insertions(+), 14 deletions(-) rename {wgsh => src/wgsh}/wg-post-down.sh.bak (100%) rename {wgsh => src/wgsh}/wg-post-up.sh (100%) rename {wgsh => src/wgsh}/wg-pre-down.sh (100%) rename {wgsh => src/wgsh}/wg-pre-up.sh (100%) rename {wgsh => src/wgsh}/wg0-post-up.sh (58%) rename wgsh/wg0-post-down.sh => src/wgsh/wg0-pre-down.sh (50%) diff --git a/src/config.js b/src/config.js index edc72e53..9a97fc72 100644 --- a/src/config.js +++ b/src/config.js @@ -10,7 +10,7 @@ module.exports.WEBUI_HOST = process.env.WEBUI_HOST || '0.0.0.0'; module.exports.PASSWORD = process.env.PASSWORD || ''; module.exports.WG_PATH = process.env.WG_PATH || '/etc/wireguard/'; module.exports.WG_DEVICE = process.env.WG_DEVICE || 'ens3'; -module.exports.WG_HOST = process.env.WG_HOST || 'oracle-test.duckdns.org'; +module.exports.WG_HOST = process.env.WG_HOST || 'oracle-daily.duckdns.org'; module.exports.WG_PORT = 51820; module.exports.WG_MTU = process.env.WG_MTU || 1412; module.exports.WG_PERSISTENT_KEEPALIVE = process.env.WG_PERSISTENT_KEEPALIVE || 25; diff --git a/wgsh/wg-post-down.sh.bak b/src/wgsh/wg-post-down.sh.bak similarity index 100% rename from wgsh/wg-post-down.sh.bak rename to src/wgsh/wg-post-down.sh.bak diff --git a/wgsh/wg-post-up.sh b/src/wgsh/wg-post-up.sh similarity index 100% rename from wgsh/wg-post-up.sh rename to src/wgsh/wg-post-up.sh diff --git a/wgsh/wg-pre-down.sh b/src/wgsh/wg-pre-down.sh similarity index 100% rename from wgsh/wg-pre-down.sh rename to src/wgsh/wg-pre-down.sh diff --git a/wgsh/wg-pre-up.sh b/src/wgsh/wg-pre-up.sh similarity index 100% rename from wgsh/wg-pre-up.sh rename to src/wgsh/wg-pre-up.sh diff --git a/wgsh/wg0-post-up.sh b/src/wgsh/wg0-post-up.sh similarity index 58% rename from wgsh/wg0-post-up.sh rename to src/wgsh/wg0-post-up.sh index 81837012..f9f89b66 100644 --- a/wgsh/wg0-post-up.sh +++ b/src/wgsh/wg0-post-up.sh @@ -4,7 +4,7 @@ set +e IPT="/sbin/iptables" IPT6="/sbin/ip6tables" -IN_FACE="ens3" # NIC connected to the internet +IN_FACE="enp0s3" # NIC connected to the internet WG_FACE="wg0" # WG NIC SUB_NET="10.250.1.0/24" # WG IPv4 sub/net aka CIDR # SUB_NET_6="" # Change this according @@ -12,13 +12,12 @@ WG_PORT="51820" # WG udp port # WG_TABLE='10' ## IPv4 ## working with single tunnel +$IPT -I INPUT 1 -p udp --dport $WG_PORT -j ACCEPT # for incoming connection +$IPT -I INPUT 1 -p tcp --dport 51821 -j ACCEPT # for webui $IPT -t nat -I POSTROUTING 1 -s $SUB_NET -o $IN_FACE -j MASQUERADE -$IPT -I FORWARD 1 -i $IN_FACE -o $WG_FACE -j ACCEPT #for internet -$IPT -I FORWARD 1 -i $WG_FACE -o $IN_FACE -j ACCEPT #for internet -$IPT -I INPUT 1 -i $IN_FACE -p udp --dport $WG_PORT -j ACCEPT # for incoming connection -$IPT -I INPUT 1 -i $IN_FACE -p tcp --dport 51821 -j ACCEPT # for webui -# $IPT -I INPUT 1 -i $WG_FACE -p tcp --dport 51821 -j ACCEPT -wg set wg0 fwmark 51820 +$IPT -I FORWARD 1 -i $WG_FACE -j ACCEPT #for internet +$IPT -I FORWARD 1 -o $WG_FACE -j ACCEPT #for internet +# wg set wg0 fwmark 51820 ## IPv6 (Uncomment) ## # $IPT6 -t nat -I POSTROUTING 1 -s $SUB_NET_6 -o $IN_FACE -j MASQUERADE diff --git a/wgsh/wg0-post-down.sh b/src/wgsh/wg0-pre-down.sh similarity index 50% rename from wgsh/wg0-post-down.sh rename to src/wgsh/wg0-pre-down.sh index 24a3cac7..6d5a174c 100644 --- a/wgsh/wg0-post-down.sh +++ b/src/wgsh/wg0-pre-down.sh @@ -4,7 +4,7 @@ set +e IPT="/sbin/iptables" IPT6="/sbin/ip6tables" -IN_FACE="ens3" # NIC connected to the internet +IN_FACE="enp0s3" # NIC connected to the internet WG_FACE="wg0" # WG NIC SUB_NET="10.250.1.0/24" # WG IPv4 sub/net aka CIDR #SUB_NET_6="fd42:42:42::/64" # WG IPv6 sub/net @@ -12,11 +12,17 @@ WG_PORT="61820" # WG udp port WG_TABLE='10' # IPv4 rules # +$IPT -D INPUT -p udp --dport $WG_PORT -j ACCEPT # for incoming connection +$IPT -D INPUT -p tcp --dport 51821 -j ACCEPT # for webui $IPT -t nat -D POSTROUTING -s $SUB_NET -o $IN_FACE -j MASQUERADE -$IPT -D FORWARD -i $IN_FACE -o $WG_FACE -j ACCEPT -$IPT -D FORWARD -i $WG_FACE -o $IN_FACE -j ACCEPT -$IPT -D INPUT -i $IN_FACE -p udp --dport $WG_PORT -j ACCEPT -ip rule del from all lookup $WG_TABLE pref 10 +$IPT -D FORWARD -i $WG_FACE -j ACCEPT #for internet +$IPT -D FORWARD -o $WG_FACE -j ACCEPT #for internet + +# $IPT -t nat -D POSTROUTING -s $SUB_NET -o $IN_FACE -j MASQUERADE +# $IPT -D FORWARD -i $IN_FACE -o $WG_FACE -j ACCEPT +# $IPT -D FORWARD -i $WG_FACE -o $IN_FACE -j ACCEPT +# $IPT -D INPUT -i $IN_FACE -p udp --dport $WG_PORT -j ACCEPT +# ip rule del from all lookup $WG_TABLE pref 10 # IPv6 rules (uncomment) # # $IPT6 -t nat -D POSTROUTING -s $SUB_NET_6 -o $IN_FACE -j MASQUERADE diff --git a/wg-easy.service b/wg-easy.service index 1eaedcd3..10205169 100644 --- a/wg-easy.service +++ b/wg-easy.service @@ -14,7 +14,7 @@ After=network-online.target nss-lookup.target docker.service #Environment="WG_PERSISTENT_KEEPALIVE=25" #Value in seconds to keep the "connection" open. If this value is 0, then connections won't be kept alive. Type=simple RemainAfterExit=no -ExecStart=/usr/bin/env node /home/ubuntu/wg-easy/server.js +ExecStart=/usr/bin/env node /home/ubuntu/wg-easy/src/server.js Restart=on-failure RestartSec=1