diff --git a/deployment/www/go.sh b/deployment/www/go.sh index b4abac6..335a8f1 100755 --- a/deployment/www/go.sh +++ b/deployment/www/go.sh @@ -134,6 +134,9 @@ fi bash -c ./stub/nginx_yml.sh bash -c ./stub/ghost_yml.sh +bash -c ./stub/gitea_yml.sh + + # # start a browser session; point it to port 80 to ensure HTTPS redirect. # wait-for-it -t 320 "$PRIMARY_WWW_FQDN:80" # wait-for-it -t 320 "$PRIMARY_WWW_FQDN:443" diff --git a/deployment/www/stub/ghost_yml.sh b/deployment/www/stub/ghost_yml.sh index 9bb7fbb..40648b4 100755 --- a/deployment/www/stub/ghost_yml.sh +++ b/deployment/www/stub/ghost_yml.sh @@ -15,6 +15,7 @@ for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do # for each language specified in the site_definition, we spawn a separate ghost container # at https://www.domain.com/$LANGUAGE_CODE for LANGUAGE_CODE in ${SITE_LANGUAGE_CODES//,/ }; do + STACK_NAME="$DOCKER_STACK_SUFFIX-$LANGUAGE_CODE" # ensure directories on remote host exist so we can mount them into the containers. @@ -81,22 +82,25 @@ EOL networks: EOL - if [ "$DEPLOY_GHOST" = true ]; then - GHOSTNET_NAME="ghostnet-$DOCKER_STACK_SUFFIX-$LANGUAGE_CODE" - GHOSTDBNET_NAME="ghostdbnet-$DOCKER_STACK_SUFFIX-$LANGUAGE_CODE" + if [ "$DEPLOY_GHOST" = true ]; then + GHOSTNET_NAME="ghostnet-$DOCKER_STACK_SUFFIX-$LANGUAGE_CODE" + GHOSTDBNET_NAME="ghostdbnet-$DOCKER_STACK_SUFFIX-$LANGUAGE_CODE" - cat >>"$DOCKER_YAML_PATH" <>"$DOCKER_YAML_PATH" < "$DOCKER_YAML_PATH" + cat >>"$DOCKER_YAML_PATH" <>"$DOCKER_YAML_PATH" <>"$DOCKER_YAML_PATH" <>"$NGINX_CONF_PATH" <>"$NGINX_CONF_PATH" <>"$NGINX_CONF_PATH" <>"$DOCKER_YAML_PATH" <>"$DOCKER_YAML_PATH" <>"$DOCKER_YAML_PATH" <>"$DOCKER_YAML_PATH" <>"$DOCKER_YAML_PATH" <