X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=wrt-setup;h=15f28cb7f553d3885eb1d0a86d5d070d1572afca;hb=bdcc37dee90597b4a65c2ae24b9fc26f15adfc11;hp=b4372198b460a0d03f8eb1fe354abbaa12500144;hpb=f74458d51ebaeba827307920c7a66ed2d69d6fbd;p=automated-distro-installer

diff --git a/wrt-setup b/wrt-setup
index b437219..15f28cb 100755
--- a/wrt-setup
+++ b/wrt-setup
@@ -25,7 +25,6 @@ pmirror() {
     # doesn't go into the firmware. build new firmware if you want
     # lots of upgrades.
     f=(/tmp/opkg-lists/*)
-    f=${f[0]}
     if ! (( $(date -r $f +%s) + 60*60*24 > $(date +%s) )); then
         opkg update
     fi
@@ -172,6 +171,13 @@ v /etc/init.d/nfsd enable
 # EOF
 
 
+v cedit /etc/config/network <<'EOF' || v /etc/init.d/network reload
+config 'route' 'transmission'
+        option 'interface' 'lan'
+        option 'target' '10.173.0.0'
+        option 'netmask' '255.255.0.0'
+        option 'gateway' '192.168.1.2'
+EOF
 
 v cedit /etc/config/firewall <<'EOF' || firewall_restart=true
 config redirect
@@ -185,7 +191,52 @@ config rule
     option target           ACCEPT
     option dest_port        22
 
+config redirect
+    option name sshalt
+    option src              wan
+    option src_dport        2222
+    option dest_port        22
+    option dest_ip          192.168.1.3
+    option dest             lan
+config rule
+    option src              wan
+    option target           ACCEPT
+    option dest_port        2222
+
+config redirect
+       option src              wan
+       option src_dport        443
+       option dest             lan
+       option dest_ip          192.168.1.2
+       option proto            tcp
+config rule
+       option src              wan
+       option target           ACCEPT
+       option dest_port        443
+       option proto            tcp
 
+config redirect
+       option src              wan
+       option src_dport        80
+       option dest             lan
+       option dest_ip          192.168.1.2
+       option proto            tcp
+config rule
+       option src              wan
+       option target           ACCEPT
+       option dest_port        80
+       option proto            tcp
+
+config redirect
+    option name syncthing
+    option src              wan
+    option src_dport        22001
+    option dest_ip          192.168.1.2
+    option dest             lan
+config rule
+    option src              wan
+    option target           ACCEPT
+    option dest_port        22001
 
 EOF
 
@@ -195,20 +246,19 @@ EOF
 dnsmasq_restart=false
 v cedit /etc/hosts <<EOF || dnsmasq_restart=true
 192.168.1.1 wrt
-192.168.1.2 treetowl faiserver $IMPERSONAL_DOMAIN
-192.168.1.3 frodo
+192.168.1.2 treetowl mail.iankelling.org $HOME_DOMAIN
+192.168.1.3 frodo faiserver
 192.168.1.4 htpc
 192.168.1.5 x2
-192.168.1.6 testvm
+192.168.1.6 demohost
+#192.168.1.7 faiserver
 192.168.1.8 tp
 72.14.176.105 li
-173.255.202.210 lj
-23.239.31.172 lk
+45.33.9.11 lj
 138.68.10.24 dopub
-# cant ssh to do when on vpn. some routing/firewall rule or something,
-# I don't know. I can get there from wrt but not my machine.
-# but we can get to it from this address, so, good enough.
-10.8.0.1 do
+# 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.
+10.173.0.2 transmission
 EOF
 
 
@@ -224,6 +274,10 @@ fi
 
 # useful: http://wiki.openwrt.org/doc/howto/dhcp.dnsmasq
 
+# sometimes /mnt/usb fails, cuz it's just a flash drive,
+# so make sure we have this dir or else dnsmasq will fail
+# to start.
+mkdir -p /mnt/usb/tftpboot
 v cedit /etc/dnsmasq.conf <<'EOF' || dnsmasq_restart=true
 
 ############ updating dns servers ###################3
@@ -272,7 +326,7 @@ dhcp-host=00:1f:16:16:39:24,set:x2,192.168.1.5,x2
 # 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,192.168.1.6,demohost
-dhcp-host=52:54:00:56:09:f9,set:faiserver,192.168.1.7,faiserver
+#dhcp-host=52:54:00:56:09:f9,set:faiserver,192.168.1.7,faiserver
 dhcp-host=80:fa:5b:1c:6e:cf,set:tp,192.168.1.8,tp
 # this is the ip it picks by default if dhcp fails,
 # so might as well use it.