From bad8c05da88dc7aced38eb75d067d063ae0048d2 Mon Sep 17 00:00:00 2001
From: greysoh <me@greysoh.dev>
Date: Fri, 2 Aug 2024 17:21:29 -0400
Subject: [PATCH] fix: Gets all install scripts working.

---
 serverinfra/base-scripts/role.agent.sh       | 2 +-
 serverinfra/base-scripts/role.server-init.sh | 2 +-
 serverinfra/base-scripts/role.server.sh      | 2 +-
 serverinfra/config/.env.example              | 3 +++
 serverinfra/install.sh                       | 3 +--
 serverinfra/shell.nix                        | 1 +
 6 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/serverinfra/base-scripts/role.agent.sh b/serverinfra/base-scripts/role.agent.sh
index 9069e99..a7bc010 100755
--- a/serverinfra/base-scripts/role.agent.sh
+++ b/serverinfra/base-scripts/role.agent.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 sudo apt update
-sudo apt install -y curl
+sudo apt install -y curl avahi-daemon
 
 ufw allow 6443/tcp
 ufw allow from 10.42.0.0/16 to any
diff --git a/serverinfra/base-scripts/role.server-init.sh b/serverinfra/base-scripts/role.server-init.sh
index ea1eda4..b397f00 100755
--- a/serverinfra/base-scripts/role.server-init.sh
+++ b/serverinfra/base-scripts/role.server-init.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 sudo apt update
-sudo apt install -y curl
+sudo apt install -y curl avahi-daemon
 
 ufw allow 6443/tcp
 ufw allow from 10.42.0.0/16 to any
diff --git a/serverinfra/base-scripts/role.server.sh b/serverinfra/base-scripts/role.server.sh
index ce8a600..c5157ef 100755
--- a/serverinfra/base-scripts/role.server.sh
+++ b/serverinfra/base-scripts/role.server.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 sudo apt update
-sudo apt install -y curl
+sudo apt install -y curl avahi-daemon
 
 ufw allow 6443/tcp
 ufw allow from 10.42.0.0/16 to any
diff --git a/serverinfra/config/.env.example b/serverinfra/config/.env.example
index 1d86bed..d605439 100644
--- a/serverinfra/config/.env.example
+++ b/serverinfra/config/.env.example
@@ -1,5 +1,8 @@
 K3S_TOKEN="shared.secret.here"
 
 # NOTE: Password here is not strong! This password is '1234'.
+# When changing the password, remember to escape the dollar signs!
+# Example: "Hello\$world"
+
 SETUP_USERNAME="clusteradm"
 SETUP_PASSWORD="\$y\$j9T\$zoVys9dfUO/jrysh2Dtim1\$ZQbbt9Qw5qXw0NNCQ7ckdOaVM.QY70sxU82/cQz.siB"
diff --git a/serverinfra/install.sh b/serverinfra/install.sh
index 3f5dcb3..d6d554b 100755
--- a/serverinfra/install.sh
+++ b/serverinfra/install.sh
@@ -31,9 +31,8 @@ if [ "$EXTERN_IP" == "" ]; then
   fi
 fi
 
-./merge.py "$SERVER_INSTALL_PATH" "http://$EXTERN_IP:$HTTP_PORT/api/installer_update_webhook"
-
 echo "[x] initializing..."
+./merge.py "$SERVER_INSTALL_PATH" "http://$EXTERN_IP:$HTTP_PORT/api/installer_update_webhook"
 mkdir $TMPDIR
 
 echo "#cloud-config" > $TMPDIR/user-data
diff --git a/serverinfra/shell.nix b/serverinfra/shell.nix
index 6c6ca5e..d5d1b2b 100644
--- a/serverinfra/shell.nix
+++ b/serverinfra/shell.nix
@@ -11,5 +11,6 @@
 
   shellHook = ''
     ./shell
+    exit $?
   '';
 }