rnsrk/wisski-cloud-distillery
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add a resolver

Browse source 
This commit adds a resolver to the toplevel Distillery domain, to allow
resolving domains globally.
This commit is contained in:
Tom Wiesing 2022-07-27 11:17:38 +02:00
parent eee3d95351
commit 45ee6b665e
No known key found for this signature in database
11 changed files with 129 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
distillery/lib/10_config.sh
View file

@ -247,6 +247,8 @@ GRAPHDB_AUTH_FLAGS="--user $(printf "admin:%s" "$GRAPHDB_ADMIN_PASSWORD")"
# paths to composer things
DEPLOY_WEB_DIR="$DEPLOY_ROOT/core/web"
DEPLOY_SELF_DIR="$DEPLOY_ROOT/core/self"
DEPLOY_RESOLVER_DIR="$DEPLOY_ROOT/core/resolver"
DEPLOY_PREFIX_CONFIG="$DEPLOY_RESOLVER_DIR/prefix.cfg"
DEPLOY_TRIPLESTORE_DIR="$DEPLOY_ROOT/core/triplestore"
DEPLOY_SQL_DIR="$DEPLOY_ROOT/core/sql"
DEPLOY_SSH_DIR="$DEPLOY_ROOT/core/ssh"

8
distillery/lib/30_slug.sh
View file

@ -36,8 +36,12 @@ SLUG="$1"
# Compute the domain name for this instance.
# Also lowercase the domain name for consistency.
INSTANCE_DOMAIN="$SLUG.$DEFAULT_DOMAIN"
INSTANCE_DOMAIN="$(echo "$INSTANCE_DOMAIN" | tr '[:upper:]' '[:lower:]')"
function compute_instance_domain() {
INSTANCE_DOMAIN="$1.$DEFAULT_DOMAIN"
INSTANCE_DOMAIN="$(echo "$INSTANCE_DOMAIN" | tr '[:upper:]' '[:lower:]')"
echo "$INSTANCE_DOMAIN"
}
INSTANCE_DOMAIN="$(compute_instance_domain "$SLUG")"
# Next we need a username base.
# This will be used as a username across the system (linux), MySQL and GraphDB.