various fixes

[automated-distro-installer] / wrt-setup

diff --git a/wrt-setup b/wrt-setup
index d721f6ad36aa3d976e75add20920bb55f4953ec9..1c4a033c3f3c4cf9c92ab70bd1aa612920db6379 100755 (executable)
--- a/wrt-setup
+++ b/wrt-setup
@@ -15,7 +15,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
+set -eE -o pipefail
+trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
+
 
 pmirror() {
     # background: upgrading all packages is not recommended because it
@@ -89,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
 
 
 
@@ -173,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
@@ -181,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
@@ -204,7 +210,7 @@ config redirect
     option src              wan
     option src_dport        443
     option dest             lan
-    option dest_ip          192.168.1.2
+    option dest_ip          192.168.1.8
     option proto            tcp
 config rule
     option src              wan
@@ -214,14 +220,14 @@ config rule
 
 config redirect
     option src              wan
-    option src_dport        1194
+    option src_dport        1196
     option dest             lan
-    option dest_ip          192.168.1.2
+    option dest_ip          192.168.1.8
     option proto            udp
 config rule
     option src              wan
     option target           ACCEPT
-    option dest_port        1194
+    option dest_port        1196
     option proto            udp
 
 
@@ -229,7 +235,7 @@ config redirect
     option src              wan
     option src_dport        80
     option dest             lan
-    option dest_ip          192.168.1.2
+    option dest_ip          192.168.1.8
     option proto            tcp
 config rule
     option src              wan
@@ -241,7 +247,7 @@ 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
@@ -256,17 +262,21 @@ 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 b8.nz faiserver
+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
@@ -275,6 +285,10 @@ 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
@@ -350,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,
@@ -364,7 +380,6 @@ dhcp-host=c4:43:8f:f2:79:1f,set:n5,192.168.1.9,n5
 # 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.,