From c4df206577b7270654abc97bb5214778e89b2867 Mon Sep 17 00:00:00 2001
From: andriyun <andriy.yun@gmail.com>
Date: Wed, 6 Apr 2022 14:11:48 +0200
Subject: [PATCH] BKDK-521 Adjustemts for os2web-subsites

---
 .docker/os2web-subsites/.gitignore            |   2 +
 .docker/os2web-subsites/Dockerfile            |  10 ++---
 .../os2web-subsites/apache/000-default.conf   |  28 ++++++++++++++
 .../apache/os2subsites-vhost-template         |   8 +---
 .docker/os2web-subsites/docker-compose.yaml   |   6 +--
 .docker/os2web-subsites/entrypoint.sh         |  36 ++++++++++++++++++
 .docker/os2web-subsites/logs/apt/eipp.log.xz  | Bin 12028 -> 0 bytes
 .../settings/settings.local.php               |   2 +-
 8 files changed, 74 insertions(+), 18 deletions(-)
 create mode 100644 .docker/os2web-subsites/apache/000-default.conf
 delete mode 100644 .docker/os2web-subsites/logs/apt/eipp.log.xz

diff --git a/.docker/os2web-subsites/.gitignore b/.docker/os2web-subsites/.gitignore
index 2293c8cfb..b05cb584b 100644
--- a/.docker/os2web-subsites/.gitignore
+++ b/.docker/os2web-subsites/.gitignore
@@ -1,3 +1,5 @@
 .env
 volumes/*
 !volumes/.keep
+logs/*
+!logs/.keep
diff --git a/.docker/os2web-subsites/Dockerfile b/.docker/os2web-subsites/Dockerfile
index 234c3bb67..c8bc98b5e 100644
--- a/.docker/os2web-subsites/Dockerfile
+++ b/.docker/os2web-subsites/Dockerfile
@@ -15,13 +15,9 @@ RUN set -eux; \
 
 # Adding subsites provisioner script.
 RUN set -eux; \
-    sed -i "s/\"installer-paths\": {/\"installer-paths\": {\"scripts\/{\$name\}\": \[\"bellcom\/os2subsites_provision\"\],/g" composer.json; \
-	export COMPOSER_HOME="$(mktemp -d)"; \
-	echo "Loading bellcom/os2subsites_provision 05042022"; \
-	composer require bellcom/os2subsites_provision:dev-master; \
-    ln -s /opt/drupal/scripts/os2subsites_provision/8.x/bc_subsites /opt/drupal/web/modules/custom/; \
-	# delete composer cache.
-	rm -rf "$COMPOSER_HOME"
+    git clone -n https://github.com/bellcom/os2subsite_provision.git /opt/drupal/scripts/os2subsites_provision; \
+    cd /opt/drupal/scripts/os2subsites_provision && git checkout e1288f4a62ca94f191c17f9d497bd9fda9a82f61; \
+    ln -s /opt/drupal/scripts/os2subsites_provision/8.x/bc_subsites /opt/drupal/web/modules/custom/
 
 # Adding further site specific data to image.
 RUN chown -R www-data:www-data /opt/drupal/tmp /opt/drupal/logs /opt/drupal/translations; \
diff --git a/.docker/os2web-subsites/apache/000-default.conf b/.docker/os2web-subsites/apache/000-default.conf
new file mode 100644
index 000000000..cbc18bb7e
--- /dev/null
+++ b/.docker/os2web-subsites/apache/000-default.conf
@@ -0,0 +1,28 @@
+<VirtualHost *:80>
+    <Directory /opt/drupal>
+       AllowOverride All
+       Options FollowSymLinks
+    </Directory>
+
+    ServerAdmin os2web-subsites@bellcom.dk
+    DocumentRoot /var/www/html
+
+    ErrorLog ${APACHE_LOG_DIR}/error.log
+    CustomLog ${APACHE_LOG_DIR}/access.log combined
+
+    SetEnvIf X-Forwarded-Proto https HTTPS=on
+
+    php_admin_value open_basedir /opt/drupal:/usr/share/php
+    php_value include_path .:/opt/drupal
+
+    php_value log_errors 1
+    php_value html_errors 0
+    php_value display_errors 0
+    php_admin_value error_reporting 1023
+    php_value error_log /dev/stderr
+
+    php_value session.save_path /opt/drupal/sessions
+    php_admin_value upload_max_filesize 128M
+    php_admin_value post_max_size 128M
+    php_admin_value upload_tmp_dir /opt/drupal/tmp/default
+</VirtualHost>
diff --git a/.docker/os2web-subsites/apache/os2subsites-vhost-template b/.docker/os2web-subsites/apache/os2subsites-vhost-template
index d26a399ab..6b8d2415d 100644
--- a/.docker/os2web-subsites/apache/os2subsites-vhost-template
+++ b/.docker/os2web-subsites/apache/os2subsites-vhost-template
@@ -3,14 +3,10 @@
     <Directory [basedir]>
        AllowOverride All
        Options FollowSymLinks
-       # Uncommenting below will only allow a limited number of Bellcom IPs access to the site
-       #Include /etc/apache2/limit-bellcom.conf
-       # Below blocks access without auth if the domain ends with bellcom.dk
-       #Include /etc/apache2/limit-subsite-access.conf
     </Directory>
 
     ServerAdmin domains@bellcom.dk
-    DocumentRoot [basedir]/public_html
+    DocumentRoot /var/www/html
     ServerName [domain]
 
     CustomLog ${APACHE_LOG_DIR}/access.log combined
@@ -18,7 +14,7 @@
 
     php_admin_value open_basedir [basedir]:/usr/share/php
     php_value include_path .:[basedir]
-    php_value error_log ${APACHE_LOG_DIR}/error.log
+    php_value error_log /dev/stderr
     php_value session.save_path [basedir]/sessions/[domain]
     php_admin_value upload_tmp_dir [basedir]/tmp/[domain]
 
diff --git a/.docker/os2web-subsites/docker-compose.yaml b/.docker/os2web-subsites/docker-compose.yaml
index 9cee0b96c..2a5c6bd8a 100644
--- a/.docker/os2web-subsites/docker-compose.yaml
+++ b/.docker/os2web-subsites/docker-compose.yaml
@@ -9,8 +9,6 @@ networks:
 volumes:
   mysql:
     driver: local
-  os2web:
-    driver: local
 services:
 
   # General application container.
@@ -22,8 +20,8 @@ services:
       - ./logs:/var/log:delegated
       - ./volumes/drupal/private:/opt/drupal/private
       - ./volumes/drupal/web/sites:/opt/drupal/web/sites
-      - ./volumes/apache/sites-availbale:/etc/apache/sites-availbale
-      - ./volumes/apache/sites-enabled:/etc/apache/sites-enabled
+      - ./volumes/apache2/sites-available:/etc/apache2/sites-available
+      - ./volumes/apache2/sites-enabled:/etc/apache2/sites-enabled
       - ./volumes/config:/opt/drupal/config
       - ./volumes/crontabs:/var/spool/cron/crontabs
       - ./volumes/tmp:/opt/drupal/tmp
diff --git a/.docker/os2web-subsites/entrypoint.sh b/.docker/os2web-subsites/entrypoint.sh
index 96b123f54..e29d86861 100644
--- a/.docker/os2web-subsites/entrypoint.sh
+++ b/.docker/os2web-subsites/entrypoint.sh
@@ -3,6 +3,13 @@
 # Starting cron service.
 service cron start
 
+# Check basic file structure for subsites creator
+if [ ! -f "/etc/apache2/sites-available/000-default.conf" ]
+then
+  cp -f /opt/drupal/.docker/os2web-subsites/apache/000-default.conf /etc/apache2/sites-available/000-default.conf
+  ln -sf /etc/apache2/sites-available/000-default.conf /etc/apache2/sites-enabled/000-default.conf
+fi
+
 # Check basic file structure for subsites creator
 if [ ! -d "/opt/drupal/web/sites/default" ]
 then
@@ -16,6 +23,35 @@ then
   chown -R www-data:www-data /opt/drupal/web/sites
 fi
 
+# Check basic file structure for subsites creator
+if [ ! -f "/opt/drupal/web/sites/sites.php" ]
+then
+  echo "Creating web/sites/sites.php"
+  echo "<?php" > /opt/drupal/web/sites/sites.php
+  chown www-data:www-data /opt/drupal/web/sites/sites.php
+fi
+
+# Check default config dir
+if [ ! -f "/opt/drupal/config/default" ]
+then
+  mkdir -p /opt/drupal/config/default
+  chown www-data:www-data -R /opt/drupal/config
+fi
+
+# Check default temp dir
+if [ ! -f "/opt/drupal/tmp/default" ]
+then
+  mkdir -p /opt/drupal/tmp/default
+  chown www-data:www-data -R /opt/drupal/tmp
+fi
+
+# Check default private dir
+if [ ! -f "/opt/drupal/private/default" ]
+then
+  mkdir -p /opt/drupal/private/default
+  chown www-data:www-data -R /opt/drupal/private
+fi
+
 # Copying shared settings file
 cp -f /opt/drupal/.docker/os2web-subsites/settings/shared.settings.php /opt/drupal/web/sites/shared.settings.php
 
diff --git a/.docker/os2web-subsites/logs/apt/eipp.log.xz b/.docker/os2web-subsites/logs/apt/eipp.log.xz
deleted file mode 100644
index 5e5eeefa59f11afba45d3fc3d63864a0de7a1ebb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12028
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
a0oGmdl>`7t?%!sy#Ao{g000001X)^-e}|R;

diff --git a/.docker/os2web-subsites/settings/settings.local.php b/.docker/os2web-subsites/settings/settings.local.php
index 8c5dfbc0d..60c251332 100755
--- a/.docker/os2web-subsites/settings/settings.local.php
+++ b/.docker/os2web-subsites/settings/settings.local.php
@@ -46,6 +46,6 @@
 
 // Passing EXTERNAL_DB_PROVISIONING into Drupal settings.
 if (getenv('EXTERNAL_DB_PROVISIONING')) {
-  $settings['external_db_provisioning'] =  getenv('EXTERNAL_DB_PROVISIONING');
+  $config['bc_subsites.settings']['external_db_provisioning'] =  getenv('EXTERNAL_DB_PROVISIONING');
 }