From 5f46d3c2b8aa8a927fdc91671eb6eff689199f73 Mon Sep 17 00:00:00 2001 From: cclohmar Date: Tue, 7 Jul 2026 15:33:22 +0100 Subject: [PATCH] refactor: rename backup dir to /opt/backup/certificates/ --- deploy.sh | 8 ++++---- install.sh | 2 +- tools/nextwks-tool/main.go | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deploy.sh b/deploy.sh index 20c8959..b772d87 100755 --- a/deploy.sh +++ b/deploy.sh @@ -88,12 +88,12 @@ if [ "$GREENFIELD" = true ]; then # Step 4: Run helper tool — port 80 is free, can obtain LE certs via HTTP-01 echo "[4/6] Checking certificates..." - mkdir -p "$BACKUP_DIR/certs" + mkdir -p "$BACKUP_DIR/certificates" if [ -f "$TOOL_BIN" ]; then "$TOOL_BIN" cert \ --domains "app.${DOMAIN},dns.${DOMAIN},www.${DOMAIN}" \ --email "${TLS_EMAIL:-admin@${DOMAIN}}" \ - --backup-dir "$BACKUP_DIR/certs" 2>&1 || true + --backup-dir "$BACKUP_DIR/certificates" 2>&1 || true fi # Step 5: Build production directory structure @@ -116,8 +116,8 @@ if [ "$GREENFIELD" = true ]; then # Copy certificates from backup vault to Zoraxy cert dir for DOMAIN_SUB in app dns www; do FQDN="${DOMAIN_SUB}.${DOMAIN}" - CERT_SRC="$BACKUP_DIR/certs/${FQDN}/fullchain.pem" - KEY_SRC="$BACKUP_DIR/certs/${FQDN}/privkey.pem" + CERT_SRC="$BACKUP_DIR/certificates/${FQDN}/fullchain.pem" + KEY_SRC="$BACKUP_DIR/certificates/${FQDN}/privkey.pem" if [ -f "$CERT_SRC" ] && [ -f "$KEY_SRC" ]; then cp "$CERT_SRC" "$TARGET_DIR/config/zoraxy/conf/certs/${FQDN}.crt" cp "$KEY_SRC" "$TARGET_DIR/config/zoraxy/conf/certs/${FQDN}.key" diff --git a/install.sh b/install.sh index c2a5db5..ae8ebee 100755 --- a/install.sh +++ b/install.sh @@ -9,7 +9,7 @@ BACKUP_DIR="/opt/backup" # --- Create backup vault and runtime directories --- echo "=== NextWorkspace Setup ===" -mkdir -p "$BACKUP_DIR/certs" +mkdir -p "$BACKUP_DIR/certificates" mkdir -p "$TARGET_DIR/config/nextworkspace" mkdir -p "$TARGET_DIR/config/zoraxy/conf/proxy" mkdir -p "$TARGET_DIR/config/zoraxy/www/html" diff --git a/tools/nextwks-tool/main.go b/tools/nextwks-tool/main.go index 246b37a..fb7d723 100644 --- a/tools/nextwks-tool/main.go +++ b/tools/nextwks-tool/main.go @@ -96,8 +96,8 @@ func runCert(args []string) { fs := flag.NewFlagSet("cert", flag.ExitOnError) domainsStr := fs.String("domains", "", "Comma-separated domain list") email := fs.String("email", "", "ACME email") - backupDir := fs.String("backup-dir", "/opt/backup/certs", "Backup directory for certs") - legoDir := fs.String("lego-dir", "/opt/backup/certs", "Lego working directory") + backupDir := fs.String("backup-dir", "/opt/backup/certificates", "Backup directory for certs") + legoDir := fs.String("lego-dir", "/opt/backup/certificates", "Lego working directory") fs.Parse(args) if *domainsStr == "" || *email == "" {