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

Rename 'COMPOSER_*' -> 'DEPLOY_*' and remove unuused variables

Browse source
This commit is contained in:
Tom Wiesing 2020-06-29 10:23:05 +02:00
parent 109cb27731
commit 613fb3fe6e
No known key found for this signature in database
GPG key ID: DC1F29F2BC78AB15
6 changed files with 29 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

22
distillery/lib/10_config.sh
View file

@ -76,17 +76,9 @@ function is_valid_email() {
fi
}
# The 'DRUPAL_ROOT' variable must be an absolute path.
if ! is_valid_abspath "$DRUPAL_ROOT"; then
log_error "Variable 'DRUPAL_ROOT' is missing or not a valid path. ";
log_info "Please verify that it is set correctly in '.env'. ";
log_info "Please ensure that it does not end in '/'. ";
exit 1;
fi
# The 'COMPOSER_ROOT' variable must be an absolute path.
if ! is_valid_abspath "$COMPOSER_ROOT"; then
log_error "Variable 'COMPOSER_ROOT' is missing or not a valid path. ";
# 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. ";
log_info "Please verify that it is set correctly in '.env'. ";
log_info "Please ensure that it does not end in '/'. ";
exit 1;
@ -159,10 +151,10 @@ if ! is_valid_number "$PASSWORD_LENGTH"; then
fi
# paths to composer things
COMPOSER_WEB_DIR="$COMPOSER_ROOT/core/web"
COMPOSER_TRIPLESTORE_DIR="$COMPOSER_ROOT/core/triplestore"
COMPOSER_SQL_DIR="$COMPOSER_ROOT/core/sql"
COMPOSER_INSTANCES_DIR="$COMPOSER_ROOT/instances"
DEPLOY_WEB_DIR="$DEPLOY_ROOT/core/web"
DEPLOY_TRIPLESTORE_DIR="$DEPLOY_ROOT/core/triplestore"
DEPLOY_SQL_DIR="$DEPLOY_ROOT/core/sql"
DEPLOY_INSTANCES_DIR="$DEPLOY_ROOT/instances"
log_ok "Read and validated configuration file. "

4
distillery/lib/20_sql.sh
View file

@ -34,7 +34,7 @@ function _wait_for_sql_internal() {
# 'dockerized_mysql' runs an sql command in the sql docker container
function dockerized_mysql() {
pushd "$COMPOSER_SQL_DIR" > /dev/null
pushd "$DEPLOY_SQL_DIR" > /dev/null
docker exec -i `docker-compose ps -q sql` mysql "$@"
retval=$?
popd > /dev/null
@ -43,7 +43,7 @@ function dockerized_mysql() {
# 'dockerized_mysql' runs an sql command in the sql docker container interactively
function dockerized_mysql_interactive() {
pushd "$COMPOSER_SQL_DIR" > /dev/null
pushd "$DEPLOY_SQL_DIR" > /dev/null
docker exec -ti `docker-compose ps -q sql` mysql "$@"
retval=$?
popd > /dev/null

2
distillery/lib/30_slug.sh
View file

@ -57,7 +57,7 @@ GRAPHDB_USER="${GRAPHDB_USER_PREFIX}${USERNAME_BASE}"
GRAPHDB_REPO="${GRAPHDB_REPO_PREFIX}${USERNAME_BASE}"
# Compute the base directory for the files that will live on disk.
INSTANCE_BASE_DIR="$COMPOSER_INSTANCES_DIR/$INSTANCE_DOMAIN"
INSTANCE_BASE_DIR="$DEPLOY_INSTANCES_DIR/$INSTANCE_DOMAIN"
INSTANCE_DATA_DIR="$INSTANCE_BASE_DIR/data/"
if [ -n "$CERTBOT_EMAIL" ]; then