bunch of minor updates

[automated-distro-installer] / wrt-setup-local

diff --git a/wrt-setup-local b/wrt-setup-local
index b8d36e02b2bd6bd23b29366945db079a939156c3..18b4b910131137c6fc38ab757b60bfe7ac001994 100755 (executable)
--- a/wrt-setup-local
+++ b/wrt-setup-local
@@ -39,15 +39,19 @@ EOF
 
 
 
+dnsmasq_restart=false
+firewall_restart=false
 dev2=false
 test=false
 libremanage_host=wrt2
 
-if [[ -e /p/router-secrets ]]; then
-  source /p/router-secrets
+secrets=false
+if [[ -e /root/router-secrets ]]; then
+  secrets=true
+  source /root/router-secrets
 fi
 rmac=$(cat /sys/class/net/eth0/address)
-if [[ $rhost ]]; then
+if $secrets; then
   hostname=${rhost[$rmac]}
 fi
 : ${hostname:=wrt}
@@ -83,10 +87,10 @@ while getopts hm:t: opt; do
 done
 shift "$((OPTIND-1))"   # Discard the options and sentinel --
 
-if [[ ! $mac ]] && ! $test; then
+if [[ ! $mac ]] && ! $test && $secrets; then
   # if we wanted to increment it
-  #WIRELESSMAC=${WIRELESSMAC:0: -1}$((${WIRELESSMAC: -1} + 2))
-  mac=$WIRELESSMAC
+  #mac=${mac:0: -1}$((${mac: -1} + 2))
+  mac=${rwmac[$rmac]}
 fi
 
 if (( $# != 0 )); then
@@ -183,17 +187,23 @@ udel() {
 
 ### network config
 ###
-ssid="check out gnu.org"
 lan=10.0.0.0
 if $test; then
-  ssid="gnuv3"
   lan=10.1.0.0
 elif [[ $hostname == cmc ]]; then
-  ssid=Svenska
   lan=10.2.0.0
 fi
 
-if [[ $rkey ]]; then
+if $test; then
+  ssid="gnuv3"
+elif $secrets; then
+  ssid=${rssid[$rmac]}
+fi
+
+: ${ssid:=librecmc}
+
+
+if $secrets; then
   key=${rkey[$rmac]}
 fi
 : ${key:=pictionary49}
@@ -437,17 +447,32 @@ config wireguard_wg0 'wgclient'
 EOF
 
 
-firewall_restart=false
 
 firewall-cedit() {
-  v cedit /etc/config/firewall <<EOF
-
+  case $hostname in
+    wrt)
+      v cedit host /etc/config/firewall <<EOF
+config redirect
+ option name ssh
+ option src              wan
+ option src_dport        22
+ option dest_ip          $l.3
+ option dest             lan
+EOF
+      ;;
+    cmc)
+      v cedit host /etc/config/firewall <<EOF
 config redirect
  option name ssh
  option src              wan
  option src_dport        22
  option dest_ip          $l.2
  option dest             lan
+EOF
+      ;;
+  esac
+
+  v cedit /etc/config/firewall <<EOF
 config rule
  option src              wan
  option target           ACCEPT
@@ -465,18 +490,6 @@ config rule
  option target           ACCEPT
  option dest_port        2202
 
-config redirect
- option name sshfrodo
- option src              wan
- option src_dport        2203
- option dest_port        22
- option dest_ip          $l.3
- option dest             lan
-config rule
- option src              wan
- option target           ACCEPT
- option dest_port        2203
-
 config redirect
  option name sshx2
  option src              wan
@@ -637,28 +650,57 @@ if ! uci get firewall.@zone[1].network | grep wg0 &>/dev/null; then
 fi
 
 
-dnsmasq_restart=false
+
 v cedit /etc/hosts <<EOF || dnsmasq_restart=true
 127.0.1.1 $hostname
-$l.1 $hostname b8.nz
-$l.2 kd faiserver
-$l.3 frodo
-$l.4 wrt2
-$l.5 x2
 $l.6 demohost
 #$l.7 x3
-$l.8 tp
-$l.9 bb8
-$l.14 wrt3
-2600:3c00::f03c:91ff:fe6d:baf8 li
 72.14.176.105 li
-2a01:7e01::f03c:91ff:feb5:baec l2
-172.105.84.95 l2
+2600:3c00::f03c:91ff:fe6d:baf8 li
+85.119.83.50 bk
+2001:ba8:1f1:f0c9::2 bk
 
 # 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
+case $hostname in
+  wrt)
+    v cedit host /etc/hosts <<EOF || dnsmasq_restart=true
+$l.1 $hostname t.b8.nz
+$l.3 frodo
+$l.4 wrt2
+EOF
+    v cedit host /etc/dnsmasq.conf <<EOF || dnsmasq_restart=true
+server=/b8.nz/#
+
+server=/kd.b8.nz/#
+server=/x2.b8.nz/#
+server=/tp.b8.nz/#
+server=/bb8.b8.nz/#
+server=/wrt3.b8.nz/#
+EOF
+    ;;
+
+  cmc)
+    v cedit host /etc/hosts <<EOF || dnsmasq_restart=true
+$l.1 $hostname b8.nz
+$l.2 kd
+$l.5 x2 faiserver
+$l.8 tp
+$l.9 bb8
+$l.14 wrt3
+EOF
+    v cedit host /etc/dnsmasq.conf <<EOF || dnsmasq_restart=true
+server=/t.b8.nz/#
+
+server=/frodo.b8.nz/#
+server=/wrt.b8.nz/#
+server=/wrt2.b8.nz/#
+EOF
+    ;;
+esac
+
 
 #mail_host=$(grep -F mail.iankelling.org /etc/hosts | awk '{print $1}')
 # if [[ $mail_host ]]; then
@@ -740,7 +782,9 @@ dhcp-host=c8:60:00:31:6b:75,set:kd,$l.2,kd
 #dhcp-host=c8:60:00:2b:15:07,set:kd,$l.2,kd
 dhcp-host=00:26:18:97:bb:16,set:frodo,$l.3,frodo
 # 4 is reserved for a staticly configured host.
-dhcp-host=00:1f:16:16:39:24,set:x2,$l.5,x2
+# old x2 with bad fan
+#dhcp-host=00:1f:16:16:39:24,set:x2,$l.5,x2
+dhcp-host=f0:de:f1:81:ec:88,set:x2,$l.5,x2
 # 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,