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

Make 'TARGET' configurable

Browse source 
This commit makes the TARGET of the self container redirect
configurable.
This commit is contained in:
Tom Wiesing 2020-07-10 10:21:30 +02:00
parent 2dfed350e0
commit 65a42f61e9
No known key found for this signature in database
GPG key ID: DC1F29F2BC78AB15
4 changed files with 29 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

21
distillery/lib/10_config.sh
View file

@ -76,6 +76,15 @@ function is_valid_email() {
fi
}
# 'is_valid_https_url' checks if a value is a valid url that starts with https
function is_valid_https_url() {
if [[ "$1" =~ ^https:// ]]; then
return 0;
else
return 1;
fi
}
# The 'DEPLOY_ROOT' variable must be an absolute path.
if ! is_valid_abspath "$DEPLOY_ROOT"; then
log_error "Variable 'DEPLOY_ROOT' is missing or not a valid path. ";
@ -150,6 +159,18 @@ if ! is_valid_number "$PASSWORD_LENGTH"; then
exit 1;
fi
# The 'CERTBOT_EMAIL' variable should either be empty or a valid email
if [ -n "$SELF_REDIRECT" ]; then
if ! is_valid_https_url "$SELF_REDIRECT"; then
log_error "Variable 'SELF_REDIRECT' is not a valid url. ";
log_info "It should start with https://"
log_info "Please verify that it is set correctly in '.env' or remove it completly. ";
exit 1;
fi;
else
SELF_REDIRECT="https://gitlab.cs.fau.de/AGFD/wisski-distillery"
fi
# paths to composer things
DEPLOY_WEB_DIR="$DEPLOY_ROOT/core/web"
DEPLOY_SELF_DIR="$DEPLOY_ROOT/core/self"