extend network configuration

mbT-Infrastructure · Nov 6, 2024 · 8f1467a · 8f1467a
1 parent 188f768
commit 8f1467a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/Version.txt b/Version.txt
@@ -1 +1 @@
-v0.10.0
+v0.11.0
diff --git a/scripts/install-network.sh b/scripts/install-network.sh
@@ -35,3 +35,15 @@ echo "Install default network config on device \"$DEVICE\"."
     "curl --silent --location --output /etc/network/interfaces \
     https://raw.githubusercontent.com/mbT-Infrastructure/template-config-files/main/debian/\
 network-interfaces/interfaces"
+
+"${SCRIPT_DIR}/device-run-command.sh" --device "$DEVICE" --command \
+    "bash -c 'nmcli --fields UUID,TYPE --terse connection show \
+    | grep ethernet | cut --delimiter : --fields 1 \
+    | while read -r CONNECTION; do \
+        nmcli connection modify \"\\\$CONNECTION\" 802-3-ethernet.wake-on-lan magic; \
+    done'"
+
+"${SCRIPT_DIR}/device-run-command.sh" --device "$DEVICE" --command \
+    "curl --silent --location --output /etc/nftables.conf \
+    https://raw.githubusercontent.com/mbT-Infrastructure/template-config-files/main/debian/\
+nftables/pc-debian.nft"
diff --git a/scripts/install-pc-wallet.sh b/scripts/install-pc-wallet.sh
@@ -48,6 +48,10 @@ done
 "${SCRIPT_DIR}/device-run-command.sh" --device "$DEVICE" --command  \
     "echo 'autologin-user=user' >> /etc/lightdm/lightdm.conf"
 "${SCRIPT_DIR}/install-network.sh" --device "$DEVICE"
+"${SCRIPT_DIR}/device-run-command.sh" --device "$DEVICE" --command \
+    "curl --silent --location --output /etc/nftables.conf \
+    https://raw.githubusercontent.com/mbT-Infrastructure/template-config-files/main/debian/\
+nftables/pc-wallet.nft"
 "${SCRIPT_DIR}/device-run-command.sh" --device "$DEVICE" --command  \
     "passwd --delete user && passwd --lock root"
 "${SCRIPT_DIR}/device-reboot.sh" --device "$DEVICE"

diff --git a/scripts/install-srv-debian.sh b/scripts/install-srv-debian.sh
@@ -28,6 +28,8 @@ while [[ -n "$1" ]]; do
 done
 
 "${SCRIPT_DIR}/install-base-debian.sh" --device "$DEVICE"
+"${SCRIPT_DIR}/install-base-apps.sh" --device "$DEVICE"
 "${SCRIPT_DIR}/install-server-apps.sh" --device "$DEVICE"
+"${SCRIPT_DIR}/install-network.sh" --device "$DEVICE"
 "${SCRIPT_DIR}/configure-user.sh" --device "$DEVICE" --groups docker --user user
 "${SCRIPT_DIR}/device-reboot.sh" --device "$DEVICE"