From 29038cfb0a0031faf5df86650b98ee7ef391cdf0 Mon Sep 17 00:00:00 2001
From: Derek Smith <derek@farscapian.com>
Date: Tue, 4 Apr 2023 10:56:34 -0400
Subject: [PATCH] Nostr updates.

---
 deploy.sh                |  1 +
 www/generate_certs.sh    |  2 +-
 www/stub/nginx_config.sh |  4 ++--
 www/stub/nginx_yml.sh    | 15 ++++++---------
 www/stub/nostr_yml.sh    |  5 +----
 5 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/deploy.sh b/deploy.sh
index 15e63ef..933add1 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -202,6 +202,7 @@ DUPLICITY_BACKUP_PASSPHRASE="$(new_pass)"
 DEPLOY_GHOST=true
 DEPLOY_CLAMS=false
 DEPLOY_NEXTCLOUD=false
+DEPLOY_NOSTR=false
 NOSTR_ACCOUNT_PUBKEY=
 DEPLOY_GITEA=false
 GHOST_MYSQL_PASSWORD="$(new_pass)"
diff --git a/www/generate_certs.sh b/www/generate_certs.sh
index 7da0817..e7ead6e 100755
--- a/www/generate_certs.sh
+++ b/www/generate_certs.sh
@@ -26,7 +26,7 @@ for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do
     if [ "$DEPLOY_NEXTCLOUD" = true ]; then DOMAIN_STRING="$DOMAIN_STRING -d $NEXTCLOUD_FQDN"; fi
     if [ "$DEPLOY_GITEA" = true ]; then DOMAIN_STRING="$DOMAIN_STRING -d $GITEA_FQDN"; fi
     if [ "$DEPLOY_CLAMS" = true ]; then DOMAIN_STRING="$DOMAIN_STRING -d $CLAMS_FQDN"; fi
-    if [ -n "$NOSTR_ACCOUNT_PUBKEY" ]; then DOMAIN_STRING="$DOMAIN_STRING -d $NOSTR_FQDN"; fi
+    if [ "$DEPLOY_NOSTR" = true ]; then DOMAIN_STRING="$DOMAIN_STRING -d $NOSTR_FQDN"; fi
 
     
     # if BTCPAY_ALT_NAMES has been set by the admin, iterate over the list
diff --git a/www/stub/nginx_config.sh b/www/stub/nginx_config.sh
index 7a62fa3..945409c 100755
--- a/www/stub/nginx_config.sh
+++ b/www/stub/nginx_config.sh
@@ -200,7 +200,7 @@ EOL
         
 EOL
 
-    if [ -n "$NOSTR_ACCOUNT_PUBKEY" ]; then
+    if [ "$DEPLOY_NOSTR" = true ]; then
         cat >>"$NGINX_CONF_PATH" <<EOL
         # We return a JSON object with name/pubkey mapping per NIP05.
         # https://www.reddit.com/r/nostr/comments/rrzk76/nip05_mapping_usernames_to_dns_domains_by_fiatjaf/sssss
@@ -227,7 +227,7 @@ EOL
 
 EOL
 
-    if [ -n "$NOSTR_ACCOUNT_PUBKEY" ]; then
+    if [ "$DEPLOY_NOSTR" = true ]; then
         cat >>"$NGINX_CONF_PATH" <<EOL
     # wss://$NOSTR_FQDN server block
     server {
diff --git a/www/stub/nginx_yml.sh b/www/stub/nginx_yml.sh
index fda41d1..2b1e188 100755
--- a/www/stub/nginx_yml.sh
+++ b/www/stub/nginx_yml.sh
@@ -47,11 +47,11 @@ EOL
 EOL
                 fi
 
-                if [ -n "$NOSTR_ACCOUNT_PUBKEY" ]; then
-                    cat >> "$DOCKER_YAML_PATH" <<EOL
+            if [ "$DEPLOY_NOSTR" = true ]; then
+                cat >> "$DOCKER_YAML_PATH" <<EOL
       - nostrnet-$DOMAIN_IDENTIFIER-en
 EOL
-                fi
+            fi
             fi
 
         done
@@ -126,16 +126,13 @@ EOL
 EOL
                 fi
 
-                if [ -n "$NOSTR_ACCOUNT_PUBKEY" ]; then
-                    cat >> "$DOCKER_YAML_PATH" <<EOL
+            if [ "$DEPLOY_NOSTR" = true ]; then
+                cat >> "$DOCKER_YAML_PATH" <<EOL
   nostrnet-$DOMAIN_IDENTIFIER-en:
     attachable: true
-
 EOL
-                fi
+    
             fi
-        done
-    done
 
 if [ "$STOP_SERVICES" = false ]; then
     docker stack deploy -c "$DOCKER_YAML_PATH" "reverse-proxy"
diff --git a/www/stub/nostr_yml.sh b/www/stub/nostr_yml.sh
index 1f1b4aa..5ae0851 100755
--- a/www/stub/nostr_yml.sh
+++ b/www/stub/nostr_yml.sh
@@ -14,7 +14,7 @@ for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do
     source "$SITE_PATH/site.conf"
     source ../../domain_env.sh
 
-    if [ -n "$NOSTR_ACCOUNT_PUBKEY" ]; then
+    if [ "$DEPLOY_NOSTR" = true ]; then
         REMOTE_NOSTR_PATH="$REMOTE_DATA_PATH/nostr"
         NOSTR_PATH="$REMOTE_NOSTR_PATH/$DOMAIN_NAME"
         NOSTR_CONFIG_PATH="$SITE_PATH/webstack/nostr.config"
@@ -25,7 +25,6 @@ for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do
         export DOCKER_YAML_PATH="$SITE_PATH/webstack/nostr.yml"
 
         NET_NAME="nostrnet-$DOMAIN_IDENTIFIER"
-        DBNET_NAME="nostrdbnet-$DOMAIN_IDENTIFIER"
 
         # here's the NGINX config. We support ghost and nextcloud.
         echo "" > "$DOCKER_YAML_PATH"
@@ -90,7 +89,5 @@ EOL
             docker stack deploy -c "$DOCKER_YAML_PATH" "$DOMAIN_IDENTIFIER-nostr-$LANGUAGE_CODE"
             sleep 1
         fi
-    
     fi
-
 done