From 1cde881a273948369f21cfb511a3b96d2e22e3e9 Mon Sep 17 00:00:00 2001
From: Derek Smith <derek@farscapian.com>
Date: Mon, 13 Mar 2023 14:00:36 -0400
Subject: [PATCH 1/2] Updated remote.conf

---
 deploy.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deploy.sh b/deploy.sh
index 6d0fd93..486e7a6 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -ex
 cd "$(dirname "$0")"
 
 LATEST_GIT_COMMIT="$(cat ./.git/refs/heads/main)"
@@ -156,7 +156,7 @@ fi
 # ensure our remote path is created.
 mkdir -p "$REMOTE_PATH"
 
-REMOTE_DEFINITION="$REMOTE_PATH/remote_definition"
+REMOTE_DEFINITION="$REMOTE_PATH/remote.conf"
 export REMOTE_DEFINITION="$REMOTE_DEFINITION"
 
 #########################################

From defe22876f0ea4f0344b7c58275e06fc1ccede47 Mon Sep 17 00:00:00 2001
From: Derek Smith <derek@farscapian.com>
Date: Mon, 13 Mar 2023 14:38:27 -0400
Subject: [PATCH 2/2] Update to site/project.conf

---
 deploy.sh             | 25 +++++++++++++------------
 www/stub/nostr_yml.sh |  2 +-
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/deploy.sh b/deploy.sh
index 486e7a6..cabc1a1 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -181,12 +181,13 @@ function stub_site_definition {
         ln -s "$SITE_PATH" "$PROJECT_PATH/sites/$DOMAIN_NAME"
     fi
 
-    if [ ! -f "$SITE_PATH/site_definition" ]; then
+    SITE_DEFINITION_PATH="$SITE_PATH/site.conf"
+    if [ ! -f "$SITE_DEFINITION_PATH" ]; then
+
         # check to see if the enf file exists. exist if not.
-        SITE_DEFINITION_PATH="$SITE_PATH/site_definition"
         if [ ! -f "$SITE_DEFINITION_PATH" ]; then
 
-            # stub out a site_definition with new passwords.
+            # stub out a site.conf with new passwords.
             cat >"$SITE_DEFINITION_PATH" <<EOL
 #!/bin/bash
 
@@ -209,7 +210,7 @@ export GITEA_MYSQL_ROOT_PASSWORD="$(new_pass)"
 EOL
 
             chmod 0744 "$SITE_DEFINITION_PATH"
-            echo "INFO: we stubbed a new site_definition for you at '$SITE_DEFINITION_PATH'. Go update it!"
+            echo "INFO: we stubbed a new site.conf for you at '$SITE_DEFINITION_PATH'. Go update it!"
             exit 1
 
         fi
@@ -229,10 +230,10 @@ if [ ! -d "$REMOTE_PATH/projects/$PROJECT_NAME" ]; then
 fi
 
 # check to see if the enf file exists. exist if not.
-PROJECT_DEFINITION_PATH="$PROJECT_PATH/project_definition"
+PROJECT_DEFINITION_PATH="$PROJECT_PATH/project.conf"
 if [ ! -f "$PROJECT_DEFINITION_PATH" ]; then
 
-    # stub out a project_definition
+    # stub out a project.conf
     cat >"$PROJECT_DEFINITION_PATH" <<EOL
 #!/bin/bash
 
@@ -250,7 +251,7 @@ export WWW_SERVER_MEMORY_MB="4096"
 EOL
 
     chmod 0744 "$PROJECT_DEFINITION_PATH"
-    echo "INFO: we stubbed a new project_defition for you at '$PROJECT_DEFINITION_PATH'. Go update it!"
+    echo "INFO: we stubbed a new 'project.conf' for you at '$PROJECT_DEFINITION_PATH'. Go update it!"
     echo "INFO: Learn more at https://www.sovereign-stack.org/ss-deploy/"
 
     exit 1
@@ -260,18 +261,18 @@ fi
 source "$PROJECT_DEFINITION_PATH"
 
 if [ -z "$PRIMARY_DOMAIN" ]; then
-    echo "ERROR: The PRIMARY_DOMAIN is not specified. Check your project_definition."
+    echo "ERROR: The PRIMARY_DOMAIN is not specified. Check your project.conf."
     exit 1
 fi
 
 if [ -z "$WWW_SERVER_MAC_ADDRESS" ]; then
-    echo "ERROR: the WWW_SERVER_MAC_ADDRESS is not specified. Check your project_definition."
+    echo "ERROR: the WWW_SERVER_MAC_ADDRESS is not specified. Check your project.conf."
     exit 1
 fi
 
 
 if [ -z "$BTCPAYSERVER_MAC_ADDRESS" ]; then
-    echo "ERROR: the BTCPAYSERVER_MAC_ADDRESS is not specified. Check your project_definition."
+    echo "ERROR: the BTCPAYSERVER_MAC_ADDRESS is not specified. Check your project.conf."
     exit 1
 fi
 
@@ -328,12 +329,12 @@ for VIRTUAL_MACHINE in www btcpayserver; do
 
     export SITE_PATH="$SITES_PATH/$DOMAIN_NAME"
 
-    source "$SITE_PATH/site_definition"
+    source "$SITE_PATH/site.conf"
     source ./domain_env.sh
 
     # VALIDATE THE INPUT from the ENVFILE
     if [ -z "$DOMAIN_NAME" ]; then
-        echo "ERROR: DOMAIN_NAME not specified in your site_definition."
+        echo "ERROR: DOMAIN_NAME not specified in your site.conf."
         exit 1
     fi
 
diff --git a/www/stub/nostr_yml.sh b/www/stub/nostr_yml.sh
index c9cedb2..5488cc2 100755
--- a/www/stub/nostr_yml.sh
+++ b/www/stub/nostr_yml.sh
@@ -11,7 +11,7 @@ for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do
 
     # source the site path so we know what features it has.
     source ../../../../defaults.sh
-    source "$SITE_PATH/site_definition"
+    source "$SITE_PATH/site.conf"
     source ../../domain_env.sh
 
     if [ -n "$NOSTR_ACCOUNT_PUBKEY" ]; then