X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=wrt-setup-local;h=ddf78d6f64a08db91db0a97f2f99b8c8cfdb7692;hb=debe67641f661b4e47a72cb27bb2957cd44c4bed;hp=43628bc8bee6f049a19807c2fc0c549ad45ab01c;hpb=0d7f79362d601b278236cd1c533c7333e342b54a;p=automated-distro-installer

diff --git a/wrt-setup-local b/wrt-setup-local
index 43628bc..ddf78d6 100755
--- a/wrt-setup-local
+++ b/wrt-setup-local
@@ -18,6 +18,11 @@
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
+dev2=false
+if [[ $1 == -2 ]]; then
+  dev2=true
+fi
+
 pmirror() {
   # background: upgrading all packages is not recommended because it
   # doesn't go into the firmware. build new firmware if you want
@@ -46,6 +51,10 @@ v() {
 ###
 ssid="check out gnu.org"
 lan=10.0.0.0
+if $dev2; then
+  ssid="test1"
+  lan=10.1.0.0
+fi
 mask=255.255.0.0
 l=${lan%.0}
 
@@ -68,14 +77,9 @@ done
 EOFOUTER
 chmod +x /usr/bin/archlike-pxe-mount
 
-cat >.profile <<'EOF'
-# changing login shell emits spam on ssh single commands & scp
-    # sed -i 's#/bin/ash$#/bin/bash#' /etc/passwd
-# https://github.com/openwrt/packages/issues/6137
-[ "$BASH_VERSION" != "" ] || exec /bin/bash -i
-EOF
+sed -i '/^root:/s,/bin/ash$,/bin/bash,' /etc/passwd
 v pi kmod-usb-storage block-mount kmod-fs-ext4 nfs-kernel-server \
-  tcpdump openvpn-openssl adblock
+  tcpdump openvpn-openssl adblock libusb-compat /root/relay_1.0-1_mips_24kc.ipk
 
 
 
@@ -99,17 +103,20 @@ mkdir -p /run/parabolaiso/bootmnt
 
 ## ian: usb broke on old router. if that happens, can just comment this to disable problems
 echo | cedit /etc/config/fstab ||:
-cedit /etc/config/fstab <<'EOF' || { v block umount; v block mount; }
+cedit /etc/config/fstab <<EOF || { v block umount; v block mount; }
 config global automount
       option from_fstab 1
       option anon_mount 1
 
 config mount
+# /overlay is an / overlay mount for installing extra packages, etc.
+# https://openwrt.org/docs/guide-user/additional-software/extroot_configuration
       option target	/mnt/usb
+#      option target	/overlay
       option device	/dev/sda1
       option fstype	ext4
       option options	rw,async,noatime,nodiratime
-      option enabled	1
+      option enabled	0
 EOF
 
 
@@ -126,7 +133,9 @@ EOF
 
 
 # exportfs -ra wont cut it when its the same path, but now a bind mount
-cedit /etc/exports <<EOF || v /etc/init.d/nfsd restart ||:
+# todo: restart nfs when nfs is enabled?
+#cedit /etc/exports <<EOF || v /etc/init.d/nfsd restart ||:
+cedit /etc/exports <<EOF ||:
 /mnt/usb  $lan/$netmask(rw,no_root_squash,insecure,sync,no_subtree_check)
 # for arch pxe
 /run/archiso/bootmnt	$lan/$netmask(rw,no_root_squash,insecure,sync,no_subtree_check)
@@ -134,10 +143,11 @@ cedit /etc/exports <<EOF || v /etc/init.d/nfsd restart ||:
 EOF
 
 
-v /etc/init.d/portmap start
-v /etc/init.d/nfsd start
-v /etc/init.d/portmap enable
-v /etc/init.d/nfsd enable
+# todo: enable nfs when we need it only.
+# v /etc/init.d/portmap start
+# v /etc/init.d/nfsd start
+# v /etc/init.d/portmap enable
+# v /etc/init.d/nfsd enable
 
 
 
@@ -156,29 +166,38 @@ v /etc/init.d/nfsd enable
 # fi
 
 
+uset() {
+  local key="$1"
+  local val="$2"
+  local service="${key%%.*}"
+  restart_var=${service}_restart
+  if [[ ! ${!restart_var} ]]; then
+    eval $restart_var=false
+  fi
+  if [[ $(uci get "$key") != "$val" ]]; then
+    v uci set "$key"="$val"
+    uci commit $service
+    eval $restart_var=true
+  fi
+}
+
+uset dropbear.@dropbear[0].PasswordAuth 0
+uset dropbear.@dropbear[0].RootPasswordAuth 0
+uset dropbear.@dropbear[0].Port 2220
+
 wireless_restart=false
 key=pictionary49
 for x in 0 1; do
-  if [[ $(uci get wireless.default_radio$x.ssid) != "$ssid" ]]; then
-    v uci set wireless.default_radio$x.ssid="$ssid"
-    wireless_restart=true
-  fi
-  if [[ $(uci get wireless.default_radio$x.key) != $key ]]; then
-    v uci set wireless.default_radio$x.key=$key
-    wireless_restart=true
-  fi
-  if [[ $(uci get wireless.default_radio$x.encryption) != psk2 ]]; then
-    v uci set wireless.default_radio$x.encryption=psk2
-    wireless_restart=true
-  fi
-  if [[ $(uci get wireless.default_radio$x.disabled 2>/dev/null) ]]; then
-    v uci delete wireless.default_radio$x.disabled
+  uset wireless.default_radio$x.ssid "$ssid"
+  uset wireless.default_radio$x.key $key
+  uset wireless.default_radio$x.encryption psk2
+  if [[ $(uci get wireless.radio$x.disabled 2>/dev/null) ]]; then
+    v uci delete wireless.radio$x.disabled
     wireless_restart=true
   fi
 done
 
 if $wireless_restart; then
-  uci commit wireless
   v wifi
 fi
 
@@ -240,6 +259,12 @@ config rule
     option target           ACCEPT
     option dest_port        2222
 
+config rule
+    option src              wan
+    option target           ACCEPT
+    option dest_port        2220
+
+
 config redirect
     option src              wan
     option src_dport        443
@@ -296,7 +321,6 @@ 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
 $l.1 wrt
@@ -305,19 +329,16 @@ $l.3 frodo
 $l.4 htpc
 $l.5 x2
 $l.6 demohost
-#$l.7 faiserver
+$l.7 x3
 $l.8 tp faiserver b8.nz
-$l.9 n5
-$l.10 so
-$l.12 fz
 72.14.176.105 li
-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.
 10.173.0.2 transmission
 EOF
 
+#mail_host=$(grep -F mail.iankelling.org /etc/hosts | awk '{print $1}')
 # if [[ $mail_host ]]; then
 #     sed -i '/^$mail_host/a mail.iankelling.org' /etc/hosts
 # fi
@@ -332,22 +353,9 @@ if [[ $(uci get dhcp.@dnsmasq[0].resolvfile 2>/dev/null) ]]; then
   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
-
+uset dhcp.@dnsmasq[0].domain b8.nz
+uset dhcp.@dnsmasq[0].local /b8.nz/
+uset system.@system[0].hostname wrt
 
 if [[ $(uci get adblock.global.adb_enabled) != 1 ]]; then
   v uci set adblock.global.adb_enabled=1
@@ -412,16 +420,18 @@ dhcp-host=c8:60:00:31:6b:75,set:kd,$l.2,kd
 dhcp-host=00:26:18:97:bb:16,set:frodo,$l.3,frodo
 dhcp-host=10:78:d2:da:29:22,set:htpc,$l.4,htpc
 dhcp-host=00:1f:16:16:39:24,set:x2,$l.5,x2
-#dhcp-host=00:c0:ca:27:e9:b2,set:x2w,$l.11,x2w
-#wireless interface
-# this is so fai can have an explicit name to use for testing,
+# 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,
 # and copying the generated mac, so it should be randomish.
 dhcp-host=52:54:00:9c:ef:ad,set:demohost,$l.6,demohost
-#dhcp-host=52:54:00:56:09:f9,set:faiserver,$l.7,faiserver
+dhcp-host=00:1f:16:14:01:d8,set:tp,$l.7,x3
 dhcp-host=80:fa:5b:1c:6e:cf,set:tp,$l.8,tp
-# this is the ip it picks by default if dhcp fails,
+
+# faiserver vm
+dhcp-host=52:54:00:56:09:f9,set:faiserver,$l.15,faiserver
+
+# 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,$l.251,switch9429ca
@@ -443,20 +453,14 @@ if $firewall_restart; then
   v /etc/init.d/firewall restart
 fi
 
+uset network.lan.ipaddr $l.1
+uset network.lan.netmask $mask
 
-reboot=false
-if [[ $(uci get network.lan.ipaddr) != $l.1 ]]; then
-  v uci set network.lan.ipaddr=$l.1
-  uci commit network
-  reboot=true
+if $network_restart; then
+  reboot
 fi
-if [[ $(uci get network.lan.netmask) != $mask ]]; then
-  v uci set network.lan.netmask=$mask
-  uci commit network
-  reboot=true
+if $dropbear_restart; then
+  v /etc/init.d/dropbear restart
 fi
 
-if $reboot; then
-  reboot
-fi
 exit 0