fi
# for calling outside of FAI without args:
-# fai-redep
#
# source /b/fai/fai-wrapper
# - set any appropriate classes with: fai-setclass OPT1... which sets CLASS_OPT1=true...
# happen to already be setup.
#
# mktab: for running outside of fai and generating a crypttab for
-# the main root fs in /tmp/fai. Must run with env var, eg export DISTRO=trisquelnabia.
+# the main root fs in /tmp/fai. Must run with env var, eg export DISTRO=trisquelaramo.
#
# Example use in a bootstrap distro:
# scp /a/bin/fai/fai/config/{distro-install-common/devbyid,hooks/partition.DEFAULT} root@HOST:
#
# environment variables:
#
-# HOSTNAME: if frodo, we exclude 2 devices from the /boot array, which
-# the bios does not see. if demohost, we set the luks password to just
-# 'x'.
+# HOSTNAME: if demohost, we set the luks password to just
+# 'x'. Used in various other ways too.
#
# SPECIAL_DISK: For use outside of fai. A base disk name like
# /dev/sdk. If set, we just cryptsetup and partition this one disk then
# boot
-
-
##### end configuration
##### begin function defs
SWAPLIST=\${SWAPLIST:-"${swap_devs[@]}"}
EOF
+ if [[ $HOSTNAME == frodo ]]; then
+ big_disks=(
+ ata-Hitachi_HDS722020ALA330_JK1121YAG7SXWS-part1
+ ata-Hitachi_HDS722020ALA330_JK1121YAG7SY4S-part1
+ ata-Hitachi_HDS723030ALA640_MK0311YHG2WUSA-part1
+ ata-ST4000DM000-1F2168_Z300AZ6K-part1
+ ata-ST6000DM001-1XY17Z_Z4D2WMZK-part1
+ ata-TOSHIBA_MD04ACA500_8539K4TQFS9A-part1
+ ata-TOSHIBA_MD04ACA500_85NAK4T2FS9A-part1
+ ata-TOSHIBA_MD04ACA500_9551K615FS9A-part1
+ ata-TOSHIBA_MD04ACA500_Y5IFK6IJFS9A-part1
+ )
+ for d in ${big_disks[@]}; do
+ cat >>/tmp/fai/crypttab <<EOF
+crypt_dev_$d /dev/disk/by-id/$d /mnt/root/q/root/luks/iank discard,luks
+EOF
+ done
+ cat >> /tmp/fai/fstab <<EOF
+/dev/mapper/crypt_dev_${big_disks[0]} /mnt/i btrfs nofail,$fstabstd,noatime,subvolid=0 0 0
+EOF
+ fi
if [[ $HOSTNAME == kd ]]; then
# note, having these with keyscript and initramfs causes a luks error in fai.log,
# but it is safely ignorable and gets us the ability to just type our password
fi
fi
- if [[ ! $SPECIAL_DISK ]]; then
+ if [[ $SPECIAL_DISK ]]; then
+ lvcreate -y -L $max_root_mib $vg -n data
+ else
# -L unit default mebibyte
lvcreate -y -L $root_mib $vg -n root
if ! fsf; then
# into ipxe which can't persist data, if we ever got that working.
mkfs.ext2 $dev$grub_extsuf
+ if [[ $SPECIAL_DISK ]]; then
+ luks-setup /dev/$vg/data crypt-$vg-data
+ exit 0
+ fi
+
# for fsf, no encryption of root because root will not contain any
# sensitive data.
if ! fsf; then
luks-setup /dev/$vg/o crypt-$vg-o
fi
- if [[ $SPECIAL_DISK ]]; then
- exit 0
- fi
done
ls -la /dev/btrfs-control # this was probably for debugging...
sleep 1
option target ACCEPT
option dest_port 2209
+
+config redirect
+ option name sshkd
+ option src wan
+ option src_dport 2202
+ option dest_port 22
+ option dest_ip $l.2
+ option dest lan
+config rule
+ option src wan
+ option target ACCEPT
+ option dest_port 2202
+
+
config redirect
option name icecast
option src wan
option dest_port 8000
config rule
- option name sshwrt
+ option name sshcmc
option src wan
option target ACCEPT
option dest_port 2220
option dest_port $wgport
option proto udp
+config redirect
+ option name navidrome
+ option src wan
+ option src_dport 4533
+ option dest_port 4533
+ option dest_ip $l.2
+ option dest lan
+config rule
+ option src wan
+ option target ACCEPT
+ option dest_port 4533
+
+# So a client can just have i.b8.nz dns even when they
+# are on the lan.
+#config redirect
+# option name navidromelan
+# option src lan
+# option src_dport 4533
+# option dest_port 4533
+# option dest_ip $l.2
+# option dest lan
+
+
+# config redirect
+# option name icecast
+# option src wan
+# option src_dport 8000
+# option dest_port 8000
+# option dest_ip $l.2
+# option dest lan
+# config rule
+# option src wan
+# option target ACCEPT
+# option dest_port 8000
config redirect
option name http
option dest_port 443
option proto tcp
-config redirect
-option name httpskd8448
- option src wan
- option src_dport 8448
- option dest lan
- option dest_ip $l.2
- option proto tcp
-config rule
- option src wan
- option target ACCEPT
- option dest_port 8448
- option proto tcp
+# config redirect
+# option name httpskd8448
+# option src wan
+# option src_dport 8448
+# option dest lan
+# option dest_ip $l.2
+# option proto tcp
+# config rule
+# option src wan
+# option target ACCEPT
+# option dest_port 8448
+# option proto tcp
config redirect
option name syncthing
option target ACCEPT
option family ipv6
-config rule
- option name http-ipv6
- option src wan
- option dest lan
- option dest_port 80
- option target ACCEPT
- option family ipv6
-
-config rule
- option name https-ipv6
- option src wan
- option dest lan
- option dest_port 443
- option target ACCEPT
- option family ipv6
+# config rule
+# option name http-ipv6
+# option src wan
+# option dest lan
+# option dest_port 80
+# option target ACCEPT
+# option family ipv6
+
+# config rule
+# option name https-ipv6
+# option src wan
+# option dest lan
+# option dest_port 443
+# option target ACCEPT
+# option family ipv6
config rule
option name node-exporter
option target ACCEPT
option family ipv6
+EOF
+}
+firewall-cedit || firewall_restart=true
+
+# firewall comment:
# not using and in newer wrt, fails, probably due to nonexistent file, error output
-# on
+# on:
# Reference error: left-hand side expression is not an array or object
# In [anonymous function](), file /usr/share/ucode/fw4.uc, line 3137, byte 12:
# called from function [anonymous function] (/usr/share/ucode/fw4.uc:733:72)
# called from function render_ruleset (/usr/share/firewall4/main.uc:56:24)
# called from anonymous function (/usr/share/firewall4/main.uc:143:29)
-
+#
# ` if (!inc.enabled) {`
# Near here -------^
#
# The rendered ruleset contains errors, not doing firewall restart.
# /usr/bin/wrt-setup-local:160:error: ""$@"" returned 1
-
## include a file with users custom iptables rules
#config include
# option path /etc/firewall.user
# option type 'restore'
# option family 'ipv4'
-EOF
-}
-firewall-cedit || firewall_restart=true
-
-
-
# not using wireguard for now
local-data-ptr: "10.2.0.5 x2.b8.nz"
local-data-ptr: "10.2.0.6 x2w.b8.nz"
local-data-ptr: "10.2.0.7 syw.b8.nz"
-local-data-ptr: "10.2.0.8 amy.b8.nz"
+local-data-ptr: "10.2.0.8 tp.b8.nz"
local-data-ptr: "10.2.0.9 bb8.b8.nz"
local-data-ptr: "10.2.0.12 demohost.b8.nz"
local-data-ptr: "10.2.0.14 wrt3.b8.nz"
+local-data-ptr: "10.2.0.17 x3w.b8.nz"
+local-data-ptr: "10.2.0.18 x3.b8.nz"
local-data-ptr: "10.2.0.19 brother.b8.nz"
-local-data-ptr: "10.2.0.23 amyw.b8.nz"
+local-data-ptr: "10.2.0.23 tpw.b8.nz"
+local-data-ptr: "10.2.0.24 one9p.b8.nz"
local-data-ptr: "10.2.0.25 hp.b8.nz"
+local-data-ptr: "10.2.0.28 frodo.b8.nz"
+local-data-ptr: "10.2.0.29 bow.b8.nz"
local-data-ptr: "10.2.0.31 amazontab.b8.nz"
local-data-ptr: "10.2.0.32 samsungtab.b8.nz"
+local-data-ptr: "10.2.0.38 x8.b8.nz"
+local-data-ptr: "10.2.0.48 bigs.b8.nz"
+local-data-ptr: "10.2.0.49 pi4.b8.nz"
+local-data-ptr: "10.2.0.50 pi4w.b8.nz"
+local-data-ptr: "10.2.0.52 s22.b8.nz"
local-data-ptr: "10.173.0.2 transmission.b8.nz"
local-data-ptr: "10.173.8.1 defaultnn.b8.nz"
local-data-ptr: "10.173.8.2 nn.b8.nz"
# top port, iPXE (PCI 04:00.0) in seabios boot menu
#dhcp-host=c8:60:00:2b:15:07,set:kd,$l.2,kd
# 4 is reserved for a staticly configured host wrt2
+
+# temporarily commented
dhcp-host=f0:de:f1:81:ec:88,set:x2,$l.5,x2
+
dhcp-host=c4:8e:8f:44:f5:63,set:x2w,$l.6,x2w
dhcp-host=10:51:07:f5:f1:b8,set:syw,$l.7,syw
dhcp-host=80:fa:5b:1c:6e:cf,set:amy,$l.8,amy
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=ac:d1:b8:5c:eb:d7,set:x3w,$l.17,x3w
dhcp-host=00:1f:16:14:01:d8,set:x3,$l.18,x3
dhcp-host=00:26:b6:f7:d4:d8,set:amyw,$l.23,amyw
dhcp-host=9a:c6:52:6f:ce:7c,set:onep9,$l.24,onep9
dhcp-host=38:63:bb:07:5a:f9,set:hp,$l.25,hp
-dhcp-host=00:26:b6:f6:0f:e9,set:frodow,$l.28,frodow
+dhcp-host=00:26:18:97:bb:16,set:frodo,$l.28,frodo
+#dhcp-host=00:26:b6:f6:0f:e9,set:frodow,$l.28,frodow
dhcp-host=70:a6:cc:3a:bb:b4,set:bow,$l.29,bow
dhcp-host=6c:56:97:88:7b:74,set:amazontab,$l.31,amazontab
dhcp-host=0a:8a:9b:cf:b5:ec,set:samsungtab,$l.32,samsungtab
-dhcp-host=b8:27:eb:78:21:1d,set:pi3b,$l.33,pi3b
# old x2 with bad fan
dhcp-host=00:1f:16:16:39:24,set:x8,$l.38,x8
# server d16:
dhcp-host=38:2c:4a:c9:33:13,set:bigs,$l.48,bigs
-dhcp-host=e4:5f:01:07:50:40,set:pi4w,$l.49,pi4
-dhcp-host=e4:5f:01:07:50:3f,set:pi4,$l.50,pi4w
+dhcp-host=e4:5f:01:07:50:40,set:pi4,$l.49,pi4
+dhcp-host=e4:5f:01:07:50:3f,set:pi4w,$l.50,pi4w
+# samsung phone
+dhcp-host=a8:79:8d:71:54:68,set:s22,$l.52,s22
# 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
-
# template
# dhcp-host=,$l.,
v /etc/init.d/firewall restart
fi
-# turn off luci
-/etc/init.d/uhttpd stop
-/etc/init.d/uhttpd disable
+## turn off luci
+# if already stopped, gives error we want to ignore
+/etc/init.d/uhttpd stop |& sed '1{/^Command failed/d}'
+/etc/init.d/uhttpd disable |& sed '1{/^Command failed/d}'
# this may just restart the network and take care of the network_restart below.
if $wireless_restart; then
iankelling.org / git / automated-distro-installer / commitdiff