provision.sh: Update trusted host patterns

distillery/resources/compose/barrel/.dockerignore

@@ -4,4 +4,5 @@
 # allow the following files:
 !conf/*
 !scripts/*
-!patch/*
+!patch/*
+!wisskiutils/*

distillery/resources/compose/barrel/Dockerfile

@@ -91,12 +91,13 @@ VOLUME /var/www/data
 
 # Add and configure the entrypoint
 ADD scripts/entrypoint.sh /entrypoint.sh
-ADD scripts/create_adapter.php /create_adapter.php
+
 ENTRYPOINT [ "/entrypoint.sh" ]
 CMD ["apache2-foreground"]
 
-# Add the provision script
+# Add the provision script and WissKI utils
 ADD scripts/provision_container.sh /provision_container.sh
+ADD wisskiutils/ /wisskiutils
 
 # Add the user_shell.sh
 ADD scripts/user_shell.sh /user_shell.sh

distillery/resources/compose/barrel/scripts/provision_container.sh

@@ -130,7 +130,11 @@ drush pm-enable --yes wisski_core wisski_linkblock wisski_pathbuilder wisski_ada
 drupal_sites_permission_workaround
 
 log_info " => Setting up WissKI Salz Adapter"
-drush php:script /create_adapter.php "$INSTANCE_DOMAIN" "$GRAPHDB_REPO" "$GRAPHDB_HEADER"
+drush php:script /wisskiutils/create_adapter.php "$INSTANCE_DOMAIN" "$GRAPHDB_REPO" "$GRAPHDB_HEADER"
+
+log_info " => Updating TRUSTED_HOST_PATTERNS in settings.php"
+
+/bin/bash /wisskiutils/set_trusted_host.sh
 
 log_info " => Provisioning is now complete. "
 log_ok "Your installation details are as follows:"

distillery/resources/compose/barrel/wisskiutils/set_trusted_host.sh

@@ -10,4 +10,4 @@ TRUSTED_HOST_PATTERN="${INSTANCE_DOMAIN//\./\\\\.}"
 TRUSTED_HOST_PATTERNS='["'$TRUSTED_HOST_PATTERN'"]'
 
 echo "Setting 'trusted_host_patterns' to $TRUSTED_HOST_PATTERNS"
-bash /utils/settings_php_set.sh 'trusted_host_patterns' "$TRUSTED_HOST_PATTERNS"
+bash /wisskiutils/settings_php_set.sh 'trusted_host_patterns' "$TRUSTED_HOST_PATTERNS"