From 9d13ec399113934f54624064fb911d8ebcee3995 Mon Sep 17 00:00:00 2001
From: Derek Smith <derek@farscapian.com>
Date: Sat, 7 Jan 2023 17:04:00 -0500
Subject: [PATCH] Simplify nostr deployment.

---
 deployment/www/go.sh             | 14 +-------------
 deployment/www/stub/nostr_yml.sh |  5 +----
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/deployment/www/go.sh b/deployment/www/go.sh
index 6becc61..de50ac1 100755
--- a/deployment/www/go.sh
+++ b/deployment/www/go.sh
@@ -55,11 +55,6 @@ for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do
         fi
     fi
 
-    if [ -z "$NOSTR_ACCOUNT_PUBKEY" ]; then
-        echo "ERROR: Ensure NOSTR_ACCOUNT_PUBKEY is configured in your site_definition."
-        exit 1
-    fi
-
     if [ -z "$DUPLICITY_BACKUP_PASSPHRASE" ]; then
         echo "ERROR: Ensure DUPLICITY_BACKUP_PASSPHRASE is configured in your site_definition."
         exit 1
@@ -70,12 +65,6 @@ for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do
         exit 1
     fi
 
-    if [ -z "$NOSTR_ACCOUNT_PUBKEY" ]; then 
-        echo "ERROR: You MUST specify a Nostr public key. This is how you get all your social features."
-        echo "INFO: Go to your site_definition file and set the NOSTR_ACCOUNT_PUBKEY variable."
-        exit 1
-    fi
-
     TOR_CONFIG_PATH=
 
 done
@@ -104,8 +93,7 @@ if [ "$RESTART_FRONT_END" = true ]; then
 
         # wait for all docker containers to stop.
         # TODO see if there's a way to check for this.
-        sleep 15
-        
+        sleep 20
     fi
 
     # generate the certs and grab a backup
diff --git a/deployment/www/stub/nostr_yml.sh b/deployment/www/stub/nostr_yml.sh
index 7ec900f..841b4cf 100755
--- a/deployment/www/stub/nostr_yml.sh
+++ b/deployment/www/stub/nostr_yml.sh
@@ -63,13 +63,10 @@ EOL
 [info]
 relay_url = "wss://${NOSTR_FQDN}/"
 name = "${NOSTR_FQDN}"
-description = "A nostr relay for ${DOMAIN_NAME}."
+description = "A nostr relay for ${DOMAIN_NAME} whitelisted for pubkey ${NOSTR_ACCOUNT_PUBKEY}."
 pubkey = "${NOSTR_ACCOUNT_PUBKEY}"
 contact = "mailto:${CERTIFICATE_EMAIL_ADDRESS}"
 
-# administrative contact pubkey TODO
-pubkey = "${NOSTR_ACCOUNT_PUBKEY}"
-
 [options]
 reject_future_seconds = 1800