chore(scripts): more script related updates btw

Signed-off-by: Andrei Jiroh Halili (RecapTime.dev) <ajhalili2006@crew.recaptime.dev>

config/systemd/caddy.service

@@ -20,7 +20,7 @@ User=caddy
 Group=caddy
 WorkingDirectory=/var/lib/caddy/src
 RuntimeDirectory=caddyserver
-ExecStart=/usr/local/bin/caddy run --envfile ./decrypted.env --environ --resume
+ExecStart=/usr/local/bin/caddy run --environ --resume
 ExecReload=CADDY_ADMIN=localhost:20241 /var/lib/caddy/src/scripts/apply
 TimeoutStopSec=5s
 LimitNOFILE=1048576

scripts/setup-server

@@ -11,12 +11,12 @@ fi
 set -xe
 CADDY_CONFIG_HOME=${CADDY_CONFIG_HOME:-"/var/lib/caddy/src"}
 
+# Copy configurations and then reload systemd
 cp "${CADDY_CONFIG_HOME}/config/sudo_caddy.conf" "/etc/sudoers.d/caddy"
-
 cp "${CADDY_CONFIG_HOME}/config/systemd/caddy.service" "/etc/systemd/system/caddy.service"
 systemctl daemon-reload
 
-if [[ "$(command -v caddy)" == "/usr/local/bin/caddy" ]]; then
+if [[ -f /usr/local/bin/caddy ]]; then
   caddy upgrade
 else
   if ! command -v caddy >> /dev/null; then
@@ -26,13 +26,10 @@ else
     ln -s "$(command -v caddy)" /usr/local/bin/caddy
   fi
 fi
+curl -fsS https://dotenvx.sh | sh
 
-if [[ ${FF_ONLY_RELOAD_CONFIG} != "" ]]; then
-  exit 0
+if [[ -L "/etc/systemd/system/multi-user.target.wants/caddy.service" ]]; then
+  systemctl restart caddy.service
 else
-  if [[ -L "/etc/systemd/system/multi-user.target.wants/caddy.service" ]]; then
-    systemctl restart caddy.service
-  else
-    systemctl enable caddy.service --now
-  fi
+  systemctl enable caddy.service --now
 fi