Fixed Drupal multisite configs

Author: lmakarov

.docksal/commands/init

@@ -111,8 +111,6 @@ site_install_anothersite ()
 
 	# Initialize local settings
 	copy_settings_file "sites/example.com/example.settings.local.php" "sites/example.com/settings.local.php"
-	fin exec sed -i "s/%host%/${VIRTUAL_HOST}/g" "/var/www/${DOCROOT}/sites/sites.php"
-	fin exec sed -i "s/%host%/${VIRTUAL_HOST}/g" "/var/www/drush/aliases/drupal7-advanced.aliases.drushrc.php"
 
 	# Create an additional database
 	fin db create 'anothersite'

docroot/sites/example.com/example.settings.local.php

@@ -1,29 +1,33 @@
 <?php
 
-# Docker DB connection settings.
+# Docksal DB connection settings.
 $databases['default']['default'] = array (
+  'driver' => 'mysql',
   'database' => 'anothersite',
   'username' => 'user',
   'password' => 'user',
   'host' => 'db',
-  'driver' => 'mysql',
+  'charset' => 'utf8mb4',
+  'collation' => 'utf8mb4_general_ci'
 );
 
 # File system settings.
 $conf['file_temporary_path'] = '/tmp';
-# Workaround for permission issues with NFS shares in Vagrant
+# Workaround for permission issues with NFS shares
 $conf['file_chmod_directory'] = 0777;
 $conf['file_chmod_file'] = 0666;
 
-# Reverse proxy configuration (Docksal's vhost-proxy)
-$conf['reverse_proxy'] = TRUE;
-$conf['reverse_proxy_addresses'] = array($_SERVER['REMOTE_ADDR']);
-// HTTPS behind reverse-proxy
-if (
-  isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' &&
-  !empty($conf['reverse_proxy']) && in_array($_SERVER['REMOTE_ADDR'], $conf['reverse_proxy_addresses'])
-) {
-  $_SERVER['HTTPS'] = 'on';
-  // This is hardcoded because there is no header specifying the original port.
-  $_SERVER['SERVER_PORT'] = 443;
+# Reverse proxy configuration (Docksal vhost-proxy)
+if (!drupal_is_cli()) {
+  $conf['reverse_proxy'] = TRUE;
+  $conf['reverse_proxy_addresses'] = array($_SERVER['REMOTE_ADDR']);
+  // HTTPS behind reverse-proxy
+  if (
+    isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' &&
+    !empty($conf['reverse_proxy']) && in_array($_SERVER['REMOTE_ADDR'], $conf['reverse_proxy_addresses'])
+  ) {
+    $_SERVER['HTTPS'] = 'on';
+    // This is hardcoded because there is no header specifying the original port.
+    $_SERVER['SERVER_PORT'] = 443;
+  }
 }

docroot/sites/sites.php

@@ -1,3 +1,3 @@
 <?php
 
-$sites['anothersite.boilerplate-drupal7-advanced.docksal.site'] = 'example.com';
+$sites['anothersite.drupal7-advanced.docksal.site'] = 'example.com';

drush/aliases/drupal7-advanced.aliases.drushrc.php

@@ -2,10 +2,10 @@
 
 $aliases['default'] = array(
   'root' => '/var/www/docroot',
-  'uri'  => 'boilerplate-drupal7-advanced.docksal.site',
+  'uri'  => 'drupal7-advanced.docksal.site',
 );
 
 $aliases['anothersite'] = array(
   'root' => '/var/www/docroot',
-  'uri'  => 'anothersite.boilerplate-drupal7-advanced.docksal.site',
+  'uri'  => 'anothersite.drupal7-advanced.docksal.site',
 );