diff --git a/domain_env.sh b/domain_env.sh index 6f1d065..348d6be 100755 --- a/domain_env.sh +++ b/domain_env.sh @@ -8,7 +8,6 @@ export BTCPAY_USER_FQDN="$BTCPAY_HOSTNAME_IN_CERT.$DOMAIN_NAME" export WWW_FQDN="$WWW_HOSTNAME.$DOMAIN_NAME" export GITEA_FQDN="$GITEA_HOSTNAME.$DOMAIN_NAME" export NOSTR_FQDN="$NOSTR_HOSTNAME.$DOMAIN_NAME" -export CLAMS_FQDN="$CLAMS_HOSTNAME.$DOMAIN_NAME" export ADMIN_ACCOUNT_USERNAME="info" export CERTIFICATE_EMAIL_ADDRESS="$ADMIN_ACCOUNT_USERNAME@$DOMAIN_NAME" diff --git a/www/generate_certs.sh b/www/generate_certs.sh index a488261..67a5d2d 100755 --- a/www/generate_certs.sh +++ b/www/generate_certs.sh @@ -22,10 +22,8 @@ for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do # this is minimum required; www and btcpay. DOMAIN_STRING="-d $DOMAIN_NAME -d $WWW_FQDN -d $BTCPAY_USER_FQDN" - if [ "$DOMAIN_NAME" = "$PRIMARY_DOMAIN" ]; then DOMAIN_STRING="$DOMAIN_STRING -d $CLAMS_FQDN"; fi 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 [ "$DEPLOY_NOSTR" = true ]; then DOMAIN_STRING="$DOMAIN_STRING -d $NOSTR_FQDN"; fi diff --git a/www/go.sh b/www/go.sh index 39b6337..39384d2 100755 --- a/www/go.sh +++ b/www/go.sh @@ -11,7 +11,6 @@ export DOCKER_HOST="$DOCKER_HOST" # Create the nginx config file which covers all domainys. bash -c ./stub/nginx_config.sh -BUILD_CLAMS=false for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do export DOMAIN_NAME="$DOMAIN_NAME" export SITE_PATH="$SITES_PATH/$DOMAIN_NAME" @@ -20,12 +19,6 @@ for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do source ../project_defaults.sh source "$SITE_PATH/site.conf" source ../domain_env.sh - - if [ "$DEPLOY_CLAMS" = true ]; then - BUILD_CLAMS=true - fi - - export BUILD_CLAMS="$BUILD_CLAMS" ### Let's check to ensure all the requiredsettings are set. if [ "$DEPLOY_GHOST" = true ]; then @@ -131,15 +124,7 @@ if [ "$RESTART_FRONT_END" = true ]; then else ./backup_path.sh fi - done -else - exit 0 -fi - -# build the clams docker image -if [ "$BUILD_CLAMS" = true ]; then - ./clams/build.sh -fi +done # nginx gets deployed first since it "owns" the docker networks of downstream services. ./stub/nginx_yml.sh diff --git a/www/stub/nginx_config.sh b/www/stub/nginx_config.sh index b6f2f21..75a2e3b 100755 --- a/www/stub/nginx_config.sh +++ b/www/stub/nginx_config.sh @@ -58,24 +58,6 @@ http { EOL fi - - if [ "$DEPLOY_CLAMS" = true ]; then - # clams-browser-app server - cat >>"$NGINX_CONF_PATH" <>"$NGINX_CONF_PATH" <>"$NGINX_CONF_PATH" <>"$NGINX_CONF_PATH"