diff --git a/laptop/etc/systemd/resolved.conf b/laptop/etc/systemd/resolved.conf index 6622e5a..18cfe4a 100644 --- a/laptop/etc/systemd/resolved.conf +++ b/laptop/etc/systemd/resolved.conf @@ -1,6 +1,5 @@ [Resolve] DNS=2620:fe::10#dns10.quad9.net 9.9.9.10#dns10.quad9.net FallbackDNS= -LLMNR=false DNSSEC=true DNSOverTLS=true diff --git a/router/etc/hostname b/router/etc/hostname new file mode 100644 index 0000000..2a45535 --- /dev/null +++ b/router/etc/hostname @@ -0,0 +1 @@ +router.strypsteen.com diff --git a/home/etc/sysconfig/nftables.conf b/router/etc/sysconfig/nftables.conf similarity index 100% rename from home/etc/sysconfig/nftables.conf rename to router/etc/sysconfig/nftables.conf diff --git a/home/etc/systemd/network/external.network b/router/etc/systemd/network/external.network similarity index 100% rename from home/etc/systemd/network/external.network rename to router/etc/systemd/network/external.network diff --git a/home/etc/systemd/network/internal.network b/router/etc/systemd/network/internal.network similarity index 100% rename from home/etc/systemd/network/internal.network rename to router/etc/systemd/network/internal.network diff --git a/home/etc/systemd/network/untrusted.network b/router/etc/systemd/network/untrusted.network similarity index 100% rename from home/etc/systemd/network/untrusted.network rename to router/etc/systemd/network/untrusted.network diff --git a/home/etc/systemd/network/wifi.network b/router/etc/systemd/network/wifi.network similarity index 100% rename from home/etc/systemd/network/wifi.network rename to router/etc/systemd/network/wifi.network diff --git a/home/etc/systemd/resolved.conf b/router/etc/systemd/resolved.conf similarity index 95% rename from home/etc/systemd/resolved.conf rename to router/etc/systemd/resolved.conf index 02f1a97..02c084c 100644 --- a/home/etc/systemd/resolved.conf +++ b/router/etc/systemd/resolved.conf @@ -3,7 +3,6 @@ DNS=2620:fe::10#dns10.quad9.net 9.9.9.10#dns10.quad9.net FallbackDNS= DNSSEC=true DNSOverTLS=true -LLMNR=false DNSStubListenerExtra=192.168.255.1 DNSStubListenerExtra=192.168.254.1 DNSStubListenerExtra=192.168.253.1 diff --git a/home/etc/systemd/system/systemd-networkd-wait-online.service.d/override.conf b/router/etc/systemd/system/systemd-networkd-wait-online.service.d/override.conf similarity index 100% rename from home/etc/systemd/system/systemd-networkd-wait-online.service.d/override.conf rename to router/etc/systemd/system/systemd-networkd-wait-online.service.d/override.conf diff --git a/setup-home.sh b/setup-home.sh index 2d5477b..df518bf 100644 --- a/setup-home.sh +++ b/setup-home.sh @@ -2,7 +2,4 @@ set -e cp -R home/* / sh setup-server.sh -rpm-ostree install --idempotent hostapd systemd-networkd wireless-regdb -systemctl enable --now nftables systemd-networkd -systemctl disable --now NetworkManager systemd-tmpfiles --create diff --git a/setup-router.sh b/setup-router.sh new file mode 100644 index 0000000..810ed4e --- /dev/null +++ b/setup-router.sh @@ -0,0 +1,7 @@ +#!/bin/sh +set -e +cp -R home/* / +sh setup-server.sh +rpm-ostree install --idempotent hostapd systemd-networkd wireless-regdb +systemctl enable --now nftables systemd-networkd +systemctl disable --now NetworkManager diff --git a/setup.sh b/setup.sh index 3acf062..b91c894 100755 --- a/setup.sh +++ b/setup.sh @@ -18,6 +18,8 @@ if [ -f /usr/share/qubes/marker-vm ]; then elif [ -d /usr/lib/coreos ]; then if systemd-detect-virt; then sh setup-vps.sh + elif [ -f /usr/bin/networkctl ]; then + sh setup-router.sh else sh setup-home.sh fi