From bd129ed073fccfd4e6a01f62ae58322845853cc1 Mon Sep 17 00:00:00 2001 From: Derek Smith Date: Thu, 12 Jan 2023 16:51:22 -0500 Subject: [PATCH] Remove onion artifacts. --- defaults.sh | 1 - deploy.sh | 1 - deployment/www/go.sh | 26 ------ deployment/www/stub/tor_onions.sh | 23 ----- deployment/www/stub_docker_yml.sh | 149 ------------------------------ reset_env.sh | 1 - 6 files changed, 201 deletions(-) delete mode 100644 deployment/www/stub/tor_onions.sh delete mode 100755 deployment/www/stub_docker_yml.sh diff --git a/defaults.sh b/defaults.sh index 83621d0..927bca5 100755 --- a/defaults.sh +++ b/defaults.sh @@ -7,7 +7,6 @@ export DEPLOY_WWW_SERVER=false export DEPLOY_BTCPAY_SERVER=false export DEPLOY_GHOST=false -export DEPLOY_ONION_SITE=false export DEPLOY_NEXTCLOUD=false export DEPLOY_GITEA=false diff --git a/deploy.sh b/deploy.sh index f79ebe4..2e1f265 100755 --- a/deploy.sh +++ b/deploy.sh @@ -295,7 +295,6 @@ export DEPLOY_GHOST=true export DEPLOY_NEXTCLOUD=false export NOSTR_ACCOUNT_PUBKEY="NOSTR_IDENTITY_PUBKEY_GOES_HERE" export DEPLOY_GITEA=false -#export DEPLOY_ONION_SITE=false export GHOST_MYSQL_PASSWORD="$(new_pass)" export GHOST_MYSQL_ROOT_PASSWORD="$(new_pass)" export NEXTCLOUD_MYSQL_PASSWORD="$(new_pass)" diff --git a/deployment/www/go.sh b/deployment/www/go.sh index de50ac1..6e34f5d 100755 --- a/deployment/www/go.sh +++ b/deployment/www/go.sh @@ -132,32 +132,6 @@ if [ "$RESTART_FRONT_END" = true ]; then done fi - -# if [ "$DEPLOY_ONION_SITE" = true ]; then -# # ensure the tor image is built -# docker build -t tor:latest ./tor - -# # if the tor folder doesn't exist, we provision a new one. Otherwise you need to restore. -# # this is how we generate a new torv3 endpoint. -# if ! ssh "$PRIMARY_WWW_FQDN" "[ -d $REMOTE_HOME/tor/www ]"; then -# ssh "$PRIMARY_WWW_FQDN" "mkdir -p $REMOTE_HOME/tor" -# TOR_CONFIG_PATH="$(pwd)/tor/torrc-init" -# export TOR_CONFIG_PATH="$TOR_CONFIG_PATH" -# docker stack deploy -c ./tor.yml torstack -# sleep 20 -# docker stack rm torstack -# sleep 20 -# fi - -# ONION_ADDRESS="$(ssh "$PRIMARY_WWW_FQDN" sudo cat "${REMOTE_HOME}"/tor/www/hostname)" -# export ONION_ADDRESS="$ONION_ADDRESS" - -# # # Since we run a separate ghost process, we create a new directory and symlink it to the original -# # if ! ssh "$PRIMARY_WWW_FQDN" "[ -L $REMOTE_HOME/tor_ghost ]"; then -# # ssh "$PRIMARY_WWW_FQDN" ln -s "$REMOTE_HOME/ghost_site/themes $REMOTE_HOME/tor_ghost/themes" -# # fi -# fi - # nginx gets deployed first since it "owns" the docker networks of downstream services. ./stub/nginx_yml.sh diff --git a/deployment/www/stub/tor_onions.sh b/deployment/www/stub/tor_onions.sh deleted file mode 100644 index 134cea2..0000000 --- a/deployment/www/stub/tor_onions.sh +++ /dev/null @@ -1,23 +0,0 @@ - -# # tor config -# if [ "$DEPLOY_ONION_SITE" = true ]; then -# cat >>"$NGINX_CONF_PATH" <>"$DOCKER_YAML_PATH" <>"$DOCKER_YAML_PATH" <