## ian: commented and replaced with just an echo
## since usb port seems to be busted.
-echo | cedit /etc/config/fstab
+echo | cedit /etc/config/fstab ||:
# cedit /etc/config/fstab <<'EOF' || { v block umount; v block mount; }
# config global automount
# option from_fstab 1
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
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
option src wan
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 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
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
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
192.168.1.3 frodo
192.168.1.4 htpc
-192.168.1.5 x2 faiserver b8.nz
+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
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
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,
# 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
-dhcp-host=10:78:d2:da:28:4f,set:kw,192.168.1.10,kw
-
# template
# dhcp-host=,192.168.1.,