From a4b8f09a8acd0889e8e3c354286242969dce31d6 Mon Sep 17 00:00:00 2001
From: Tom Wiesing <tkw01536@gmail.com>
Date: Tue, 12 Jul 2022 15:23:46 +0200
Subject: [PATCH] provision.sh: Update trusted host patterns

---
 distillery/resources/compose/barrel/.dockerignore           | 3 ++-
 distillery/resources/compose/barrel/Dockerfile              | 5 +++--
 .../resources/compose/barrel/scripts/provision_container.sh | 6 +++++-
 .../barrel/{scripts => wisskiutils}/create_adapter.php      | 0
 .../compose/barrel/wisskiutils}/set_trusted_host.sh         | 2 +-
 .../compose/barrel/wisskiutils}/settings_php_get.sh         | 0
 .../compose/barrel/wisskiutils}/settings_php_set.sh         | 0
 7 files changed, 11 insertions(+), 5 deletions(-)
 rename distillery/resources/compose/barrel/{scripts => wisskiutils}/create_adapter.php (100%)
 rename distillery/{utils => resources/compose/barrel/wisskiutils}/set_trusted_host.sh (83%)
 rename distillery/{utils => resources/compose/barrel/wisskiutils}/settings_php_get.sh (100%)
 rename distillery/{utils => resources/compose/barrel/wisskiutils}/settings_php_set.sh (100%)

diff --git a/distillery/resources/compose/barrel/.dockerignore b/distillery/resources/compose/barrel/.dockerignore
index f8d22a7..bdd4064 100644
--- a/distillery/resources/compose/barrel/.dockerignore
+++ b/distillery/resources/compose/barrel/.dockerignore
@@ -4,4 +4,5 @@
 # allow the following files:
 !conf/*
 !scripts/*
-!patch/*
\ No newline at end of file
+!patch/*
+!wisskiutils/*
\ No newline at end of file
diff --git a/distillery/resources/compose/barrel/Dockerfile b/distillery/resources/compose/barrel/Dockerfile
index 1a07696..60dacad 100644
--- a/distillery/resources/compose/barrel/Dockerfile
+++ b/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
diff --git a/distillery/resources/compose/barrel/scripts/provision_container.sh b/distillery/resources/compose/barrel/scripts/provision_container.sh
index 7fde29a..e69ba0d 100644
--- a/distillery/resources/compose/barrel/scripts/provision_container.sh
+++ b/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:"
diff --git a/distillery/resources/compose/barrel/scripts/create_adapter.php b/distillery/resources/compose/barrel/wisskiutils/create_adapter.php
similarity index 100%
rename from distillery/resources/compose/barrel/scripts/create_adapter.php
rename to distillery/resources/compose/barrel/wisskiutils/create_adapter.php
diff --git a/distillery/utils/set_trusted_host.sh b/distillery/resources/compose/barrel/wisskiutils/set_trusted_host.sh
similarity index 83%
rename from distillery/utils/set_trusted_host.sh
rename to distillery/resources/compose/barrel/wisskiutils/set_trusted_host.sh
index a859554..8092416 100755
--- a/distillery/utils/set_trusted_host.sh
+++ b/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"
\ No newline at end of file
+bash /wisskiutils/settings_php_set.sh 'trusted_host_patterns' "$TRUSTED_HOST_PATTERNS"
\ No newline at end of file
diff --git a/distillery/utils/settings_php_get.sh b/distillery/resources/compose/barrel/wisskiutils/settings_php_get.sh
similarity index 100%
rename from distillery/utils/settings_php_get.sh
rename to distillery/resources/compose/barrel/wisskiutils/settings_php_get.sh
diff --git a/distillery/utils/settings_php_set.sh b/distillery/resources/compose/barrel/wisskiutils/settings_php_set.sh
similarity index 100%
rename from distillery/utils/settings_php_set.sh
rename to distillery/resources/compose/barrel/wisskiutils/settings_php_set.sh