From cd3fba634e036190c09aed674da7cbfc041cbf06 Mon Sep 17 00:00:00 2001
From: okseby <okseby@protonmail.com>
Date: Thu, 26 Feb 2026 16:52:18 -0500
Subject: [PATCH] fix ssl config update

---
 install-wings.sh | 99 ++++++++++++++++++++++++++----------------------
 1 file changed, 53 insertions(+), 46 deletions(-)

diff --git a/install-wings.sh b/install-wings.sh
index 5316814..55d75ab 100644
--- a/install-wings.sh
+++ b/install-wings.sh
@@ -2,7 +2,7 @@
 set -euo pipefail
 
 # Seby's Calagopus Wings Installer
-# Designed for curl | bash usage
+# Safe for curl | bash usage
 
 ########################################
 # helpers
@@ -56,11 +56,11 @@ apt_install() {
 }
 
 ########################################
-# SSL config updater
+# SSL config updater (runs AFTER config exists)
 ########################################
-update_wings_ssl_config() {
+update_ssl_config() {
   local domain="$1"
-  local cfg="/etc/calagopus/config.yml"
+  local cfg="/etc/pterodactyl/config.yml"
   local cert="/etc/letsencrypt/live/${domain}/fullchain.pem"
   local key="/etc/letsencrypt/live/${domain}/privkey.pem"
 
@@ -69,14 +69,21 @@ update_wings_ssl_config() {
     return
   fi
 
+  if [[ ! -f "$cert" || ! -f "$key" ]]; then
+    warn "Cert files not found ($cert / $key) — skipping SSL update."
+    return
+  fi
+
   say "Updating SSL section in $cfg"
   $SUDO cp -a "$cfg" "${cfg}.bak"
 
+  # Rewrites only the ssl: block keys (expects standard indentation)
   $SUDO awk -v cert="$cert" -v key="$key" '
     BEGIN { inssl=0 }
     {
       if ($0 ~ /^  ssl:[[:space:]]*$/) { inssl=1; print; next }
       if (inssl==1) {
+        # leave ssl block when we hit the next top-level section (two spaces + non-space)
         if ($0 ~ /^  [^[:space:]]/ && $0 !~ /^  ssl:/) { inssl=0 }
         else if ($0 ~ /^    enabled:/) { print "    enabled: true"; next }
         else if ($0 ~ /^    cert:/)    { print "    cert: " cert; next }
@@ -85,6 +92,8 @@ update_wings_ssl_config() {
       print
     }
   ' "$cfg" | $SUDO tee "$cfg" >/dev/null
+
+  say "SSL config updated. Backup saved to ${cfg}.bak"
 }
 
 ########################################
@@ -94,7 +103,7 @@ need_tty
 require_root_or_sudo
 
 if ! have apt-get; then
-  err "Only Debian/Ubuntu systems supported."
+  err "Only Debian/Ubuntu supported."
   exit 1
 fi
 
@@ -110,47 +119,13 @@ else
   if confirm_default_no "Install Docker?"; then
     apt_install ca-certificates curl
     curl -fsSL https://get.docker.com/ | CHANNEL=stable $SUDO bash
+    say "Docker installed: $(docker --version || true)"
   else
     err "Docker required. Exiting."
     exit 1
   fi
 fi
 
-########################################
-# SSL (Certbot standalone)
-########################################
-DO_SSL=false
-DOMAIN=""
-EMAIL=""
-
-if confirm_default_no "Set up SSL with certbot (standalone)?"; then
-  DOMAIN="$(prompt "Enter domain (e.g. node.example.com): ")"
-  EMAIL="$(prompt "Enter email for Let's Encrypt notices: ")"
-
-  if [[ -n "$DOMAIN" && -n "$EMAIL" ]]; then
-    DO_SSL=true
-  else
-    err "Domain and email required for SSL. Skipping."
-  fi
-fi
-
-if $DO_SSL; then
-  say "Installing certbot..."
-  apt_install certbot
-
-  warn "Ports 80/443 must be open and unused."
-
-  $SUDO certbot certonly \
-    --standalone \
-    -d "$DOMAIN" \
-    --non-interactive \
-    --agree-tos \
-    --email "$EMAIL" \
-    --no-eff-email
-
-  update_wings_ssl_config "$DOMAIN"
-fi
-
 ########################################
 # Download Wings
 ########################################
@@ -176,13 +151,47 @@ say "Wings installed to $WINGS_BIN"
 "$WINGS_BIN" version || true
 
 ########################################
-# Configure
+# Configure (creates /etc/pterodactyl/config.yml)
 ########################################
-if confirm_default_no "Run wings configure --join-data now?"; then
+CONFIG_CREATED=false
+
+if confirm_default_no "Run wings configure --join-data now? (recommended)"; then
   JOIN_DATA="$(prompt "Paste join-data string: ")"
   if [[ -n "$JOIN_DATA" ]]; then
-    $SUDO mkdir -p /etc/calagopus
+    $SUDO mkdir -p /etc/pterodactyl
     $SUDO "$WINGS_BIN" configure --join-data "$JOIN_DATA"
+    CONFIG_CREATED=true
+  else
+    warn "No join-data provided; skipping configure."
+  fi
+else
+  warn "Skipping configure. SSL setup will be skipped because config.yml will not exist yet."
+fi
+
+########################################
+# SSL (after config exists)
+########################################
+if $CONFIG_CREATED && confirm_default_no "Set up SSL with certbot now?"; then
+  DOMAIN="$(prompt "Enter domain (e.g. node.example.com): ")"
+  EMAIL="$(prompt "Enter email for Let's Encrypt renewal notices: ")"
+
+  if [[ -n "$DOMAIN" && -n "$EMAIL" ]]; then
+    say "Installing certbot..."
+    apt_install certbot
+
+    warn "Ports 80/443 must be open and not in use for standalone mode."
+
+    $SUDO certbot certonly \
+      --standalone \
+      -d "$DOMAIN" \
+      --non-interactive \
+      --agree-tos \
+      --email "$EMAIL" \
+      --no-eff-email
+
+    update_ssl_config "$DOMAIN"
+  else
+    warn "Domain/email missing. Skipping SSL."
   fi
 fi
 
@@ -191,10 +200,8 @@ fi
 ########################################
 if confirm_default_no "Install as systemd service? (wings service-install)"; then
   $SUDO "$WINGS_BIN" service-install
+  say "Service status:"
   $SUDO systemctl --no-pager status wings || true
 fi
 
-########################################
-# Done
-########################################
 say "Installation complete."