Merge branch 'develop' into composer

Author: radimklaska

composer.lock

@@ -15,7 +15,7 @@
 /**
  * For custom installation
  */
-$config_directories['sync'] = "../config/default";
+$settings['config_sync_directory'] = "../config/default";
 
 /**
  * Set content directory for default_content_deploy.
@@ -115,6 +115,11 @@
   }
   // Populate secure variables.
   $config['slack_invite.settings']['token'] = getenv('SLACK_TOKEN');
+
+  // Database credentials.
+  if (file_exists('/var/www/site-php')) {
+    require '/var/www/site-php/drupalcz/drupalcz-settings.inc';
+  }
 }
 
 // Load settings.

docroot/sites/default/settings/includes.settings.php

@@ -1,13 +1,8 @@
 #! /bin/sh
 
 if [ ! -e docroot/sites/default/settings/local.settings.php ]; then
-  cp docroot/sites/default/settings/default.local.settings.php docroot/sites/default/settings/local.settings.php
-  sed -i "s/@@DB_NAME@@/drupal8/g" docroot/sites/default/settings/local.settings.php
-  sed -i "s/@@DB_USER@@/drupal8/g" docroot/sites/default/settings/local.settings.php
-  sed -i "s/@@DB_PASS@@/drupal8/g" docroot/sites/default/settings/local.settings.php
-  sed -i "s/@@DB_HOST@@/database/g" docroot/sites/default/settings/local.settings.php
+  echo -e "<?php\n\n//This is for your customizations." > docroot/sites/default/settings/local.settings.php
   echo Settings file was created.
 else
   echo Settings file already exists. Skipping creation.
 fi
-