working on daily

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;

wgsh/wg0-post-up.sh → 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

wgsh/wg0-post-down.sh → 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

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