From b38d129f56cc01b0f0184a02639f58ce3d77f20c Mon Sep 17 00:00:00 2001 From: Derek Smith Date: Fri, 22 Apr 2022 15:38:42 -0400 Subject: [PATCH] Added initial NOSTR support; NIP-05 compliance. Signed-off-by: Derek Smith --- defaults.sh | 1 + shared.sh | 18 +++++++++++++++++ stub_docker_yml.sh | 9 +++++++++ stub_nginxconf.sh | 50 ++++++++++++++++++++++++++++++++++++++-------- 4 files changed, 70 insertions(+), 8 deletions(-) diff --git a/defaults.sh b/defaults.sh index dfee58e..755cf5b 100644 --- a/defaults.sh +++ b/defaults.sh @@ -9,6 +9,7 @@ export DEPLOY_UMBREL_VPS=false # if true, then we deploy a VPS with Jitsi/Matrix export DEPLOY_GHOST=true export DEPLOY_MATRIX=false +export DEPLOY_NOSTR=false export DEPLOY_ONION_SITE=false export DEPLOY_NEXTCLOUD=false export DEPLOY_GITEA=false diff --git a/shared.sh b/shared.sh index 17991fe..97fe063 100755 --- a/shared.sh +++ b/shared.sh @@ -38,6 +38,7 @@ export DUPLICITY_BACKUP_PASSPHRASE="$(new_pass)" #export DEPLOY_UMBREL_VPS=false export DEPLOY_GHOST=true export DEPLOY_MATRIX=true +export DEPLOY_NOSTR=false export DEPLOY_NEXTCLOUD=true export DEPLOY_ONION_SITE=false # valid options: 'testnet' and 'mainnet' @@ -188,6 +189,18 @@ if [ "$DEPLOY_MATRIX" = true ]; then fi fi +if [ "$DEPLOY_NOSTR" = true ]; then + if [ -z "$NOSTR_ADMIN_ACCOUNT_PUBKEY" ]; then + echo "ERROR: Ensure NOSTR_ADMIN_ACCOUNT_PUBKEY is configured in your site_definition." + exit 1 + fi + + if [ -z "$NOSTR_ADMIN_ACCOUNT_PUBKEY" ]; then + echo "ERROR: Ensure NOSTR_ADMIN_ACCOUNT_PUBKEY is configured in your site_definition." + exit 1 + fi +fi + if [ -z "$DUPLICITY_BACKUP_PASSPHRASE" ]; then echo "ERROR: Ensure DUPLICITY_BACKUP_PASSPHRASE is configured in your site_definition." exit 1 @@ -224,3 +237,8 @@ if [ -z "$DEPLOY_UMBREL_VPS" ]; then 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 diff --git a/stub_docker_yml.sh b/stub_docker_yml.sh index 6069070..d42991b 100755 --- a/stub_docker_yml.sh +++ b/stub_docker_yml.sh @@ -143,6 +143,15 @@ fi +if [ "$DEPLOY_NOSTR" = true ]; then +cat >>"$DOCKER_YAML_PATH" <>"$DOCKER_YAML_PATH" <>"$NGINX_CONF_PATH" <>"$NGINX_CONF_PATH" <>"$NGINX_CONF_PATH" <>"$NGINX_CONF_PATH" <>"$NGINX_CONF_PATH" <>"$NGINX_CONF_PATH" <>"$NGINX_CONF_PATH" <>"$NGINX_CONF_PATH" <