X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;ds=sidebyside;f=wrt-setup-local;h=a5fd9118db2ee5b7c60087350c564ab7d51e4a4f;hb=8bb06901ce000f76dafc73288e1fe47c3032e4af;hp=094fd11b4003e8709527794ceb1d262e3084fbb7;hpb=7894812298494ef9a704d54bca3fd1f3bbf88f5f;p=automated-distro-installer

diff --git a/wrt-setup-local b/wrt-setup-local
index 094fd11..a5fd911 100755
--- a/wrt-setup-local
+++ b/wrt-setup-local
@@ -16,7 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 
-f=/usr/local/lib/err;test -r $f || { echo "error: $0 no $f" >&2;exit 1;}; . $f
+f=/usr/local/lib/bash-bear;test -r $f || { echo "error: $0 no $f" >&2;exit 1;}; . $f
 
 usage() {
   cat <<EOF
@@ -710,6 +710,19 @@ config rule
  option target           ACCEPT
  option dest_port        2202
 
+# was working on an openvpn server, didn't finish
+# config redirect
+#  option name vpnkd
+#  option src              wan
+#  option src_dport        1196
+#  option dest_port        1196
+#  option dest_ip          $l.2
+#  option dest             lan
+# config rule
+#  option src              wan
+#  option target           ACCEPT
+#  option dest_port        1196
+
 
 config redirect
  option name sshkdalt
@@ -776,9 +789,9 @@ config rule
 config redirect
  option name sshfrodo
  option src              wan
- option src_dport        2228
- option dest_port        22
- option dest_ip          $l.28
+ option src_dport        2234
+ option dest_port        34
+ option dest_ip          $l.34
  option dest             lan
 config rule
  option src              wan
@@ -811,6 +824,18 @@ config rule
  option dest_port        $wgport
  option proto            udp
 
+config redirect
+ option name navidromehttps
+ option src              wan
+ option src_dport        4500
+ option dest_port        4500
+ option dest_ip          $l.2
+ option dest             lan
+config rule
+ option src              wan
+ option target           ACCEPT
+ option dest_port        4500
+
 config redirect
  option name navidrome
  option src              wan
@@ -851,7 +876,7 @@ config redirect
  option src              wan
  option src_dport        80
  option dest             lan
- option dest_ip          $l.2
+ option dest_ip          $l.7
  option proto            tcp
 config rule
  option src              wan
@@ -864,7 +889,7 @@ config redirect
  option src              wan
  option src_dport        443
  option dest             lan
- option dest_ip          $l.2
+ option dest_ip          $l.7
  option proto            tcp
 config rule
  option src              wan
@@ -1246,23 +1271,20 @@ server=10.2.0.1
 # default dhcp range is 100-150
 # bottom port,  iPXE (PCI 03:00.0) in seabios boot menu
 dhcp-host=c8:60:00:31:6b:75,set:kd,$l.2,kd
-dhcp-host=94:05:bb:1e:2c:2e,set:sy,$l.3,sy
 #dhcp-host=94:05:bb:1e:2c:2e,set:bo,$l.38,bo
 # top port, iPXE (PCI 04:00.0) in seabios boot menu
 #dhcp-host=c8:60:00:2b:15:07,set:kd,$l.2,kd
 # 4 is reserved for a staticly configured host wrt2
 
-# temporarily commented
-dhcp-host=f0:de:f1:81:ec:88,set:x2,$l.5,x2
 
-dhcp-host=c4:8e:8f:44:f5:63,set:x2w,$l.6,x2w
+dhcp-host=c4:8e:8f:60:63:cb,set:x2w,$l.6,x2w
 dhcp-host=10:51:07:f5:f1:b8,set:syw,$l.7,syw
 dhcp-host=80:fa:5b:1c:6e:cf,set:amy,$l.8,amy
-# This is so fai can have an explicit name to use for testing,
-# or else any random machine which did a pxe boot would get
-# reformatted. The mac is from doing a virt-install, cancelling it,
-# and copying the generated mac, so it should be randomish.
-dhcp-host=52:54:00:9c:ef:ad,set:demohost,$l.12,demohost
+dhcp-host=a0:ce:c8:9f:7a:f3,set:sy,$l.12,sy
+# alternate dongle
+#dhcp-host=94:05:bb:1e:2c:2e,set:sy,$l.12,sy
+dhcp-host=00:1f:16:16:39:24,set:x2,$l.13,x2
+
 ## for using different dhcp server
 #dhcp-host=52:54:00:9c:ef:ad,ignore
 # 14 = wrt3
@@ -1274,13 +1296,11 @@ dhcp-host=00:1b:a9:8c:a8:23,set:brother,$l.19,brother
 dhcp-host=00:26:b6:f7:d4:d8,set:amyw,$l.23,amyw
 dhcp-host=9a:c6:52:6f:ce:7c,set:onep9,$l.24,onep9
 dhcp-host=38:63:bb:07:5a:f9,set:hp,$l.25,hp
-dhcp-host=14:dd:a9:d5:31:7a,set:frodo,$l.28,frodo
-#dhcp-host=00:26:b6:f6:0f:e9,set:frodow,$l.28,frodow
 dhcp-host=70:a6:cc:3a:bb:b4,set:bow,$l.29,bow
 dhcp-host=6c:56:97:88:7b:74,set:amazontab,$l.31,amazontab
 dhcp-host=0a:8a:9b:cf:b5:ec,set:samsungtab,$l.32,samsungtab
-# old x2 with bad fan
-dhcp-host=00:1f:16:16:39:24,set:x8,$l.38,x8
+dhcp-host=14:dd:a9:d5:31:7a,set:frodo,$l.34,frodo
+#dhcp-host=00:26:b6:f6:0f:e9,set:frodow,$l.34,frodow
 # server d16:
 dhcp-host=38:2c:4a:c9:33:13,set:bigs,$l.48,bigs
 dhcp-host=e4:5f:01:07:50:40,set:pi4,$l.49,pi4
@@ -1288,6 +1308,12 @@ dhcp-host=e4:5f:01:07:50:3f,set:pi4w,$l.50,pi4w
 # samsung phone
 dhcp-host=a8:79:8d:71:54:68,set:s22,$l.52,s22
 
+# This is so fai can have an explicit name to use for testing,
+# or else any random machine which did a pxe boot would get
+# reformatted. The mac is from doing a virt-install, cancelling it,
+# and copying the generated mac, so it should be randomish.
+dhcp-host=52:54:00:9c:ef:ad,set:demohost,$l.88,demohost
+
 
 # faiserver vm
 #dhcp-host=52:54:00:56:09:f9,set:faiserver,$l.15,faiserver