change partitioning to use lvm, refactor for fsf server

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

diff --git a/wrt-setup-local b/wrt-setup-local
index a1f1ee34bc1d3d4498bbea3f072c4c7b32ee71e4..7efa19a66fb7d3bc4eeed3ee21155df03d9e86e6 100755 (executable)
--- a/wrt-setup-local
+++ b/wrt-setup-local
@@ -750,11 +750,11 @@ config rule
 
 
 config redirect
- option name httpkd
+ option name http
  option src              wan
  option src_dport        80
  option dest             lan
- option dest_ip          $l.2
+ option dest_ip          $l.7
  option proto            tcp
 config rule
  option src              wan
@@ -763,11 +763,11 @@ config rule
  option proto            tcp
 
 config redirect
- option name httpskd
+ option name https
  option src              wan
  option src_dport        443
  option dest             lan
- option dest_ip          $l.2
+ option dest_ip          $l.7
  option proto            tcp
 config rule
  option src              wan
@@ -992,6 +992,8 @@ local-data-ptr: "10.173.8.2 nn.b8.nz"
 
 forward-zone:
   name: "."
+#  forward-addr: 8.8.8.8
+#  forward-addr: 8.8.8.8
 # https://developers.cloudflare.com/1.1.1.1/1.1.1.1-for-families/setup-instructions/dns-over-https
   forward-addr: 1.1.1.3@853#family.cloudflare-dns.com
   forward-addr: 1.0.0.3@853#family.cloudflare-dns.com
@@ -1118,6 +1120,8 @@ dhcp-host=80:fa:5b:1c:6e:cf,set:amy,$l.8,amy
 # 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.12,demohost
+## for using different dhcp server
+#dhcp-host=52:54:00:9c:ef:ad,ignore
 dhcp-host=62:03:cb:a8:3e:a3,set:trp,$1.13,trp
 # 14 = wrt3
 dhcp-host=00:1f:16:14:01:d8,set:x3,$l.18,x3
@@ -1137,9 +1141,8 @@ dhcp-host=e4:5f:01:07:50:40,set:pi4w,$l.39,pi4w
 #dhcp-host=,set:pi4,$l.33,pi4
 
 
-
 # faiserver vm
-dhcp-host=52:54:00:56:09:f9,set:faiserver,$l.15,faiserver
+#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.