new stack trace, linode fixes, minor improvements

[automated-distro-installer] / wrt-setup-local

diff --git a/wrt-setup-local b/wrt-setup-local
index 50626511c0a657a24ea6c8dc6cc36cabade72b6e..e7ebd38d7137914515fa36b7130e9de30f51e989 100755 (executable)
--- a/wrt-setup-local
+++ b/wrt-setup-local
@@ -349,36 +349,75 @@ config rule
  option dest_port        22
 
 config redirect
- option name sshalt
+ option name sshkd
  option src              wan
- option src_dport        2222
+ option src_dport        2202
  option dest_port        22
- option dest_ip          $l.3
+ option dest_ip          $l.2
  option dest             lan
 config rule
  option src              wan
  option target           ACCEPT
- option dest_port        2222
+ option dest_port        2202
 
+config redirect
+ option name sshfrodo
+ option src              wan
+ option src_dport        2203
+ option dest_port        22
+ option dest_ip          $l.3
+ option dest             lan
 config rule
  option src              wan
  option target           ACCEPT
- option dest_port        2220
+ option dest_port        2203
 
+config redirect
+ option name sshx2
+ option src              wan
+ option src_dport        2205
+ option dest_port        22
+ option dest_ip          $l.5
+ option dest             lan
+config rule
+ option src              wan
+ option target           ACCEPT
+ option dest_port        2205
 
 config redirect
+ option name sshx3
  option src              wan
- option src_dport        443
+ option src_dport        2207
+ option dest_port        22
+ option dest_ip          $l.7
  option dest             lan
+config rule
+ option src              wan
+ option target           ACCEPT
+ option dest_port        2207
+
+config redirect
+ option name sshtp
+ option src              wan
+ option src_dport        2208
+ option dest_port        22
  option dest_ip          $l.8
- option proto            tcp
+ option dest             lan
 config rule
  option src              wan
  option target           ACCEPT
- option dest_port        443
- option proto            tcp
+ option dest_port        2208
+
+
+config rule
+ option name sshwrt
+ option src              wan
+ option target           ACCEPT
+ option dest_port        2220
+
 
 config redirect
+ option name vpntp
  option src              wan
  option src_dport        1196
  option dest             lan
@@ -392,6 +431,7 @@ config rule
 
 
 config redirect
+ option name httptp
  option src              wan
  option src_dport        80
  option dest             lan
@@ -403,6 +443,19 @@ config rule
  option dest_port        80
  option proto            tcp
 
+config redirect
+ option name httpstp
+ option src              wan
+ option src_dport        443
+ option dest             lan
+ option dest_ip          $l.8
+ option proto            tcp
+config rule
+ option src              wan
+ option target           ACCEPT
+ option dest_port        443
+ option proto            tcp
+
 config redirect
  option name syncthing
  option src              wan
@@ -478,6 +531,7 @@ $l.8 tp b8.nz faiserver
 $l.9 bb8
 $l.14 wrt3
 72.14.176.105 li
+172.105.84.95 l2
 
 # netns creation looks for next free subnet starting at 10.173, but I only
 # use one, and I would keep this one as the first created.
@@ -525,6 +579,7 @@ server=/dmarctest.b8.nz/#
 server=/_domainkey.b8.nz/#
 server=/_dmarc.b8.nz/#
 server=/ns1.b8.nz/#
+server=/ns2.b8.nz/#
 mx-host=b8.nz,mail.iankelling.org,10
 txt-record=b8.nz,"v=spf1 a ?all"