X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=wrt-setup;h=1c4a033c3f3c4cf9c92ab70bd1aa612920db6379;hp=981a290f0f0b0dd4909f71bca1e463908dfb512d;hb=05e47f6734e5a9354a3243686ae55fe4ab2b72c7;hpb=7f77555b3d92709034fe41919358053c650c71e1

diff --git a/wrt-setup b/wrt-setup
index 981a290..1c4a033 100755
--- a/wrt-setup
+++ b/wrt-setup
@@ -18,14 +18,12 @@
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
-# ssh
 
 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
@@ -93,28 +91,32 @@ mkdir -p /run/archiso/bootmnt
 # todo: at some later time, i found /mnt/usb not mounted, watch to see if
 # that is the case after running this or rebooting.
 # wiki says safe to do in case of fstab changes:
-cedit /etc/config/fstab <<'EOF' || { v block umount; v block mount; }
-config global automount
-      option from_fstab 1
-      option anon_mount 1
-
-config global autoswap
-      option from_fstab 1
-      option anon_swap 1
-
-config mount
-      option target	/mnt/usb
-      option device	/dev/sda2
-      option fstype	ext4
-      option options	rw,async,noatime,nodiratime
-      option enabled	1
-      option enabled_fsck 0
-
-config swap
-      option device	/dev/sda1
-      option enabled	1
 
-EOF
+## ian: commented and replaced with just an echo
+## since usb port seems to be busted.
+echo | cedit /etc/config/fstab ||:
+# cedit /etc/config/fstab <<'EOF' || { v block umount; v block mount; }
+# config global automount
+#       option from_fstab 1
+#       option anon_mount 1
+
+# config global autoswap
+#       option from_fstab 1
+#       option anon_swap 1
+
+# config mount
+#       option target	/mnt/usb
+#       option device	/dev/sda2
+#       option fstype	ext2
+#       option options	rw,async,noatime,nodiratime
+#       option enabled	1
+#       option enabled_fsck 0
+
+# config swap
+#       option device	/dev/sda1
+#       option enabled	1
+
+# EOF
 
 
 
@@ -177,7 +179,7 @@ config 'route' 'transmission'
         option 'interface' 'lan'
         option 'target' '10.173.0.0'
         option 'netmask' '255.255.0.0'
-        option 'gateway' '192.168.1.2'
+        option 'gateway' '192.168.1.3'
 EOF
 
 v cedit /etc/config/firewall <<'EOF' || firewall_restart=true
@@ -185,7 +187,7 @@ config redirect
     option name ssh
     option src              wan
     option src_dport        22
-    option dest_ip          192.168.1.2
+    option dest_ip          192.168.1.8
     option dest             lan
 config rule
     option src              wan
@@ -205,55 +207,76 @@ 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.8
+    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        1196
+    option dest             lan
+    option dest_ip          192.168.1.8
+    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        1196
+    option proto            udp
+
+
+config redirect
+    option src              wan
+    option src_dport        80
+    option dest             lan
+    option dest_ip          192.168.1.8
+    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_ip          192.168.1.8
     option dest             lan
 config rule
     option src              wan
     option target           ACCEPT
     option dest_port        22001
 
+
+
 EOF
 
 
 
 
 dnsmasq_restart=false
+mail_host=$(grep -F mail.iankelling.org /etc/hosts | awk '{print $1}')
 v cedit /etc/hosts <<EOF || dnsmasq_restart=true
+127.0.1.1 wrt
 192.168.1.1 wrt
-192.168.1.2 treetowl mail.iankelling.org faiserver $HOME_DOMAIN
+192.168.1.2 treetowl
 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.8 tp faiserver b8.nz
+192.168.1.9 n5
+192.168.1.10 kw
+192.168.1.11 kww
+192.168.1.12 fz
 72.14.176.105 li
 45.33.9.11 lj
 138.68.10.24 dopub
@@ -262,16 +285,36 @@ v cedit /etc/hosts <<EOF || dnsmasq_restart=true
 10.173.0.2 transmission
 EOF
 
+# if [[ $mail_host ]]; then
+#     sed -i '/^$mail_host/a mail.iankelling.org' /etc/hosts
+# fi
+
 
 # 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
 
@@ -321,7 +364,9 @@ server=2001:4860:4860::8844
 dhcp-host=f4:6d:04:02:ed:66,set:treetowl,192.168.1.2,treetowl
 dhcp-host=00:26:18:97:bb:16,set:frodo,192.168.1.3,frodo
 dhcp-host=10:78:d2:da:29:22,set:htpc,192.168.1.4,htpc
-dhcp-host=00:1f:16:16:39:24,set:x2,192.168.1.5,x2
+dhcp-host=00:1f:16:16:39:24,set:kw,192.168.1.5,x2
+#dhcp-host=00:1f:16:16:39:24,set:kw,192.168.1.10,kw
+#dhcp-host=00:c0:ca:27:e9:b2,set:kww,192.168.1.11,kww
 # 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,
@@ -329,12 +374,12 @@ 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
 dhcp-host=b4:75:0e:94:29:ca,set:switch9429ca,192.168.1.251,switch9429ca
 
-
 # template
 # dhcp-host=,192.168.1.,