X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=wrt-setup;h=d721f6ad36aa3d976e75add20920bb55f4953ec9;hb=6201b20db7c46d78c9c11007c2aaa8d7f1738b6e;hp=c04708da3276d2533e015eb81631d11f50e2b157;hpb=a018c3030b0ebd751d5667efd96c2fd32f2423e0;p=automated-distro-installer

diff --git a/wrt-setup b/wrt-setup
index c04708d..d721f6a 100755
--- a/wrt-setup
+++ b/wrt-setup
@@ -15,17 +15,13 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
-
-# ssh
+x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
 
 pmirror() {
     # background: upgrading all packages is not recommended because it
     # 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
@@ -193,7 +189,7 @@ config rule
     option dest_port        22
 
 config redirect
-    option name ssh
+    option name sshalt
     option src              wan
     option src_dport        2222
     option dest_port        22
@@ -205,28 +201,55 @@ config rule
     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
+    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
+    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
+    option src              wan
+    option src_dport        1194
+    option dest             lan
+    option dest_ip          192.168.1.2
+    option proto            udp
 config rule
-       option src              wan
-       option target           ACCEPT
-       option dest_port        80
-       option proto            tcp
+    option src              wan
+    option target           ACCEPT
+    option dest_port        1194
+    option proto            udp
+
+
+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
 
 
@@ -234,16 +257,18 @@ EOF
 
 dnsmasq_restart=false
 v cedit /etc/hosts <<EOF || dnsmasq_restart=true
+127.0.1.1 wrt
 192.168.1.1 wrt
-192.168.1.2 treetowl $IMPERSONAL_DOMAIN faiserver
+192.168.1.2 treetowl b8.nz faiserver
 192.168.1.3 frodo
 192.168.1.4 htpc
 192.168.1.5 x2
 192.168.1.6 demohost
 #192.168.1.7 faiserver
 192.168.1.8 tp
+192.168.1.9 n5
 72.14.176.105 li
-45.33.1.160 lj
+45.33.9.11 lj
 138.68.10.24 dopub
 # 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.
@@ -254,15 +279,35 @@ EOF
 # avoid using the dns servers that my isp tells me about.
 if [[ $(uci get dhcp.@dnsmasq[0].resolvfile) ]]; then
     # default is '/tmp/resolv.conf.auto', we switch to the dnsmasq default of
-    # /etc/resolv.conf
+    # /etc/resolv.conf. not sure why I did this.
     v uci delete dhcp.@dnsmasq[0].resolvfile
     uci commit dhcp
     dnsmasq_restart=true
 fi
 
+if [[ $(uci get dhcp.@dnsmasq[0].domain) != b8.nz ]]; then
+    v uci set dhcp.@dnsmasq[0].domain=b8.nz
+    uci commit dhcp
+    dnsmasq_restart=true
+fi
+if [[ $(uci get dhcp.@dnsmasq[0].local) != b8.nz ]]; then
+    v uci set dhcp.@dnsmasq[0].local=/b8.nz/
+    uci commit dhcp
+    dnsmasq_restart=true
+fi
+
+if [[ $(uci get system.@system[0].hostname) != wrt ]]; then
+    v uci set system.@system[0].hostname=wrt
+    uci commit system
+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
@@ -313,6 +358,7 @@ dhcp-host=00:1f:16:16:39:24,set:x2,192.168.1.5,x2
 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=80:fa:5b:1c:6e:cf,set:tp,192.168.1.8,tp
+dhcp-host=c4:43:8f:f2:79:1f,set:n5,192.168.1.9,n5
 # this is the ip it picks by default if dhcp fails,
 # so might as well use it.
 # hostname is the name it uses according to telnet