Merge branch '2960237-sync-alter' into 3016995-file-path-properties

.gitlab-ci.yml

@@ -65,6 +65,7 @@ build:deb:
 test:debian-jessie-aegir3-apt:
   stage: test
   image: debian:jessie
+  allow_failure: true
   dependencies:
     - build:deb
   only:
@@ -88,6 +89,11 @@ test:debian-stretch-aegir3-apt:
   dependencies:
     - build:deb
 
+  only:
+    - 7.x-3.x
+    - /^7\.x-3\.\d+\.x/
+    - /-runalltests$/
+
   before_script:
     - apt-get update
     # Avoid ERROR: invoke-rc.d: policy-rc.d denied execution of start.
@@ -97,17 +103,13 @@ test:debian-stretch-aegir3-apt:
 
   script: "scripts/ci-aegir-dev-install-apt-debian9.sh"
 
-test:ubuntu-xenial-aegir3-apt:
+test:debian-buster-aegir3-apt:
   stage: test
-  image: ubuntu:xenial
+  image: debian:buster
+  allow_failure: false
   dependencies:
     - build:deb
 
-  only:
-    - 7.x-3.x
-    - /^7\.x-3\.\d+\.x/
-    - /-runalltests$/
-
   before_script:
     - apt-get update
     # Avoid ERROR: invoke-rc.d: policy-rc.d denied execution of start.
@@ -115,11 +117,11 @@ test:ubuntu-xenial-aegir3-apt:
     - echo "exit 0" >> /usr/sbin/policy-rc.d
     - apt-get install --yes sudo curl
 
-  script: "scripts/ci-aegir-dev-install-apt-ubuntu-xenial.sh"
+  script: "scripts/ci-aegir-dev-install-apt-debian10.sh"
 
-test:ubuntu-artful-aegir3-apt:
+test:ubuntu-xenial-aegir3-apt:
   stage: test
-  image: ubuntu:artful
+  image: ubuntu:xenial
   dependencies:
     - build:deb
 
@@ -135,8 +137,7 @@ test:ubuntu-artful-aegir3-apt:
     - echo "exit 0" >> /usr/sbin/policy-rc.d
     - apt-get install --yes sudo curl
 
-  script: "scripts/ci-aegir-dev-install-apt-ubuntu-artful.sh"
-
+  script: "scripts/ci-aegir-dev-install-apt-ubuntu-xenial.sh"
 
 test:ubuntu-bionic-aegir3-apt:
   stage: test
@@ -252,9 +253,9 @@ publish:unstable-repo:
 #
 
 # Upgrade the latest stable Aegir to our unstable repo.
-upgradetest:debian-jessie-aegir3-apt-upgrade:
+upgradetest:debian-stretch-aegir3-apt-upgrade:
   stage: upgradetest
-  image: debian:jessie
+  image: debian:stretch
   dependencies:
     - publish:unstable-repo
 
@@ -271,7 +272,7 @@ upgradetest:debian-jessie-aegir3-apt-upgrade:
     - apt-get install --yes sudo curl cron
 
   script:
-    - "scripts/ci-aegir-stable-install-apt-debian8.sh"
+    - "scripts/ci-aegir-stable-install-apt-debian9.sh"
     # extra step to run the task queue.
     - sudo su aegir --login --command 'drush @hostmaster php-eval "echo hosting_task_count();"'
     - sudo su aegir --login --command 'drush @hostmaster hosting-tasks --force'
@@ -283,6 +284,6 @@ upgradetest:debian-jessie-aegir3-apt-upgrade:
     - sudo su aegir --login --command 'drush @hostmaster php-eval "echo hosting_task_count_running();"'
     # upgrade to the latest version from the unstable repo.
     - rm -v /etc/apt/sources.list.d/aegir-stable.list
-    - echo "deb http://debian.aegirproject.org unstable main" | sudo tee -a /etc/apt/sources.list.d/aegir-unstable.list
+    - echo "deb [signed-by=/usr/share/keyrings/aegir-archive-keyring.gpg] http://debian.aegirproject.org unstable main" | sudo tee -a /etc/apt/sources.list.d/aegir-unstable.list
     - sudo apt-get update
     - sudo apt-get --yes dist-upgrade

Provision/Config/Drupal/Services.php

+<?php
+/**
+ * @file
+ * Provides the Provision_Config_Drupal_Services class.
+ */
+
+class Provision_Config_Drupal_Services extends Provision_Config {
+  public $template = 'aegir.services.tpl.php';
+  public $description = 'Drupal aegir.services.yml file';
+  protected $mode = 0440;
+
+  function filename() {
+    return $this->site_path . '/aegir.services.yml';
+  }
+
+  function process() {
+    $this->version = provision_version();
+    $this->cookie_domain = $this->getCookieDomain();
+    $this->group = $this->platform->server->web_group;
+  }
+
+  /**
+   * Extract our cookie domain from the URI.
+   */
+  protected function getCookieDomain() {
+    $uri = explode('.', $this->uri);
+    # Leave base domain; only strip out subdomains.
+    if (count($uri) > 2) {
+      $uri[0] = '';
+    }
+    return implode('.', $uri);
+  }
+
+}

Provision/Config/Drupal/aegir.services.tpl.php

+---
+
+# This file was automatically generated by Aegir <?php print $this->version; ?>
+
+# on <?php print date('r'); ?>.
+
+parameters:
+  session.storage.options:
+    cookie_domain: '<?php print $this->cookie_domain; ?>'

Provision/Config/Drupal/provision_drupal_settings_6.tpl.php

@@ -126,7 +126,6 @@ if (isset($_SERVER['db_name'])) {
   ini_set('session.cache_limiter',    'none');
   ini_set('session.cookie_lifetime',  0);
   ini_set('session.gc_maxlifetime',   200000);
-  ini_set('session.save_handler',     'user');
   ini_set('session.use_only_cookies', 1);
   ini_set('session.use_trans_sid',    0);
   ini_set('url_rewriter.tags',        '');

Provision/Config/Drupal/provision_drupal_settings_7.tpl.php

@@ -157,6 +157,11 @@ if (isset($_SERVER['db_name'])) {
 <?php endif; ?>
 <?php endif; ?>
 
+  /**
+   * Set the Syslog identity to the site name so it's not always "drupal".
+   */
+  $conf['syslog_identity'] = '<?php print $this->uri ?>';
+
 <?php print $extra_config; ?>
 
   # Additional host wide configuration settings. Useful for safely specifying configuration settings.

Provision/Config/Drupal/provision_drupal_settings_8.tpl.php

@@ -23,6 +23,7 @@ print '<?php' ?>
  */
 if (isset($_SERVER['SITE_SUBDIR']) && isset($_SERVER['RAW_HOST'])) {
   $base_url = 'http://' . $_SERVER['RAW_HOST'] . '/' . $_SERVER['SITE_SUBDIR'];
+  ini_set('session.cookie_path', '/' . $_SERVER['SITE_SUBDIR'] . '/');
 }
 <?php endif; ?>
 
@@ -110,9 +111,6 @@ if (isset($_SERVER['db_name'])) {
 
 <?php endif; ?>
 
-  $profile = "<?php print $this->profile ?>";
-  $install_profile = "<?php print $this->profile ?>";
-
   /**
   * PHP settings:
   *
@@ -133,7 +131,6 @@ if (isset($_SERVER['db_name'])) {
   */
   umask(0002);
 
-  $settings['install_profile'] = '<?php print $this->profile ?>';
   $settings['file_public_path'] = '<?php print $this->file_public_path ?>';
   $settings['file_private_path'] = '<?php print $this->file_private_path ?>';
   $config['system.file']['path']['temporary'] = '<?php print $this->file_temporary_path ?>';
@@ -163,6 +160,7 @@ if (isset($_SERVER['db_name'])) {
   /**
    * Load services definition file.
    */
+  $settings['container_yamls'][] = __DIR__ . '/aegir.services.yml';
   $settings['container_yamls'][] = __DIR__ . '/services.yml';
 
   /**
@@ -182,6 +180,11 @@ if (isset($_SERVER['db_name'])) {
     '\.local$',
   );
 
+  /**
+   * Set the Syslog identity to the site name so it's not always "drupal".
+   */
+  $config['syslog.settings']['identity'] = '<?php print $this->uri ?>';
+
 <?php print $extra_config; ?>
 
   # Additional host wide configuration settings. Useful for safely specifying configuration settings.

Provision/Config/Drushrc/Alias.php

@@ -19,10 +19,10 @@ class Provision_Config_Drushrc_Alias extends Provision_Config_Drushrc {
   function __construct($context, $data = array()) {
     parent::__construct($context, $data);
 
-    if (is_array($data['aliases'])) {
+    if (isset($data['aliases']) && is_array($data['aliases'])) {
       $data['aliases'] = array_unique($data['aliases']);
     }
-    if (is_array($data['drush_aliases'])) {
+    if (isset($data['drush_aliases']) && is_array($data['drush_aliases'])) {
       $data['drush_aliases'] = array_unique($data['drush_aliases']);
     }
 

aegir-release.make

@@ -3,17 +3,10 @@ api = 2
 
 ; This makefile fetches the latest release of Drupal from Drupal.org.
 projects[drupal][type] = "core"
-projects[drupal][version] = 7.60
 
-; Sync manually with drupal-org-core.make in the hostmaster repo.
-
-; Sync manually with drupal-org-core.make in the hostmaster repo.
-
-; Function each() is deprecated since PHP 7.2; https://www.drupal.org/project/drupal/issues/2925449
-projects[drupal][patch][2925449] = "https://www.drupal.org/files/issues/2018-04-08/deprecated_each2925449-106.patch"
-
-; [PHP 7.2] Avoid count() calls on uncountable variables; https://www.drupal.org/project/drupal/issues/2885610
-projects[drupal][patch][2885610] = "https://www.drupal.org/files/issues/2018-04-21/drupal-7-count-function-deprecation-fixes-2885610-19.patch"
+; Pin a core version, only as long as we have a core patch below.
+; Sync manually with drupal-org-core.make in the hostmaster repository.
+;projects[drupal][version] = 7.61
 
 ; The release.sh script updates the version of hostmaster.
 projects[hostmaster][type] = "profile"

debian/aegir3-cluster-slave.examples

-example.sudoers

debian/aegir3-hostmaster.postinst

@@ -33,6 +33,9 @@ case "$1" in
         # this obviously doesn't work for git releases
         VERSION=`sed -n '/^version/{s/^.*= *//;p}' /usr/share/drush/commands/provision/provision.info`
 
+        # TODO: lookup? composer installs?
+        DRUSH_PATH="/usr/local/bin/drush"
+
         FLAGS="--yes"
         if [ "$DPKG_DEBUG" = "developer" ]; then
             FLAGS="$FLAGS --debug"
@@ -68,10 +71,10 @@ case "$1" in
         chown aegir:aegir "$AEGIRHOME" "$AEGIRHOME/config" "$AEGIRHOME/config/$WEBSERVER.conf"
 
         # flush the drush cache to find new commands
-        su -s /bin/sh aegir -c 'drush cache-clear drush'
+        su -s /bin/sh aegir -c "$DRUSH_PATH cache-clear drush"
 
-        site_uri=`su -s /bin/sh aegir -c 'drush @hostmaster status --fields="uri" --field-labels=0 2>/dev/null | tr "\n" " " | sed -e "s/^[[:space:]]*//g" -e "s/[[:space:]]*\$//g"'`
-        drupal_root=`su -s /bin/sh aegir -c 'drush @hostmaster status --fields="root" --field-labels=0 2>/dev/null | tr "\n" " " | sed -e "s/^[[:space:]]*//g" -e "s/[[:space:]]*\$//g"'`
+        site_uri=`su -s /bin/sh aegir -c "$DRUSH_PATH @hostmaster status --fields='uri' --field-labels=0 2>/dev/null | tr '\n' ' ' | sed -e 's/^[[:space:]]*//g' -e 's/[[:space:]]*\$//g'"`
+        drupal_root=`su -s /bin/sh aegir -c "$DRUSH_PATH @hostmaster status --fields='root' --field-labels=0 2>/dev/null | tr '\n' ' ' | sed -e 's/^[[:space:]]*//g' -e 's/[[:space:]]*\$//g'"`
 
         if [ -d "$drupal_root" ]; then
             # upgrade
@@ -95,14 +98,14 @@ case "$1" in
                 echo "it seems to be the same version as the one we're trying to install, not upgrading"
             else
                 echo "upgrading the frontend from $drupal_root to $NEW_PLATFORM"
-                if su -s /bin/sh aegir -c 'drush @hostmaster pm-list --status=enabled --pipe' | grep -q hosting_queued; then
+                if su -s /bin/sh aegir -c "$DRUSH_PATH @hostmaster pm-list --status=enabled --pipe" | grep -q hosting_queued; then
                     service hosting-queued stop
                 fi
                 cd "$drupal_root"
-                su -s /bin/sh aegir -c "drush hostmaster-migrate $FLAGS '$site_uri' '$NEW_PLATFORM'"
+                su -s /bin/sh aegir -c "$DRUSH_PATH hostmaster-migrate $FLAGS '$site_uri' '$NEW_PLATFORM'"
                 echo "upgrade finished, old platform left in $drupal_root"
                 # restart daemon if enabled
-                if su -s /bin/sh aegir -c 'drush @hostmaster pm-list --status=enabled --pipe' | grep -q hosting_queued; then
+                if su -s /bin/sh aegir -c "$DRUSH_PATH @hostmaster pm-list --status=enabled --pipe" | grep -q hosting_queued; then
                     service hosting-queued start
                 fi
             fi
@@ -173,7 +176,7 @@ case "$1" in
             fi
 
             # pass data through JSON for extra security
-            su -s /bin/sh aegir -c "cd $AEGIRHOME && drush hostmaster-install $FLAGS --backend $site_uri 2>&1 | drush backend-parse $DEBUG" <<EOF
+            su -s /bin/sh aegir -c "cd $AEGIRHOME && $DRUSH_PATH hostmaster-install $FLAGS --backend $site_uri 2>&1 | $DRUSH_PATH backend-parse $DEBUG" <<EOF
 { "yes": 1,
   "version": "$VERSION",
   "aegir_db_host": "$AEGIR_DB_HOST",
@@ -183,11 +186,11 @@ case "$1" in
 }
 EOF
             # flush the drush cache to find new commands
-            su -s /bin/sh aegir -c 'drush cache-clear drush'
+            su -s /bin/sh aegir -c "$DRUSH_PATH cache-clear drush"
 
             # on new installs, we default to having the daemon enabled
             echo 'Enabling hosting-queued daemon'
-            su -s /bin/sh aegir -c 'drush @hostmaster pm-enable -y hosting_queued'
+            su -s /bin/sh aegir -c "$DRUSH_PATH @hostmaster pm-enable -y hosting_queued"
             service hosting-queued start
             if [ -f /bin/systemctl ]; then
               # There must be a better way, but we're trying to stay compatible with Debian Wheezy and Jessie.
@@ -215,10 +218,10 @@ EOF
         esac
 
         # this will ensure that this script aborts if the site can't be bootstrapped
-        if su -s /bin/sh aegir -c 'drush @hostmaster status' 2>&1 | grep -q 'Drupal bootstrap.*Successful'; then
+        if su -s /bin/sh aegir -c "$DRUSH_PATH @hostmaster status" 2>&1 | grep -q 'Drupal bootstrap.*Successful'; then
             echo 'Aegir frontend bootstrap correctly, operation was a success!'
             echo 'Use this URL to login on your new site:'
-            su -s /bin/sh aegir -c 'drush @hostmaster uli'
+            su -s /bin/sh aegir -c "$DRUSH_PATH @hostmaster uli"
         else
             echo 'Aegir frontend failed to bootstrap, something went wrong!'
             echo 'Look at the log above for clues or run with DPKG_DEBUG=developer'

debian/changelog

+aegir3-provision (3.180) unstable; urgency=medium
+
+  * Bugfixes and UI improvements, see http://aegir.readthedocs.org/en/3.x/release-notes/3.18
+  * Include Drupal 7.67
+
+ -- Colan Schwartz <13228-colan@users.noreply.gitlab.com>  Thu, 27 Jun 2019 15:27:28 -0400
+
+aegir3-provision (3.174) testing; urgency=medium
+
+  * Update to Hostmaster 7.x-3.174
+  * Include an updated ctools, views, module_filter
+  * Include a new Golden Contrib module: Hosting Deploy
+
+ -- Herman van Rink <helmo@initfour.nl>  Thu, 04 Apr 2019 15:48:32 +0200
+
+aegir3-provision (3.173) testing; urgency=medium
+
+  * Update to Hostmaster 7.x-3.173 & Drupal 7.63.
+
+ -- Jon Pugh <jon@thinkdrop.net>  Fri, 18 Jan 2019 14:37:21 -0500
+
+
+aegir3-provision (3.172) testing; urgency=medium
+
+  * Fix regression in legacy hosting_ssl: the logic for determining a certificate wasn't good, in the legacy module. #3020747
+
+ -- Jon Pugh <jon@thinkdrop.net>  Wed, 09 Jan 2019 10:50:08 -0500
+
+aegir3-provision (3.171) testing; urgency=medium
+
+  * Fix regression in hosting_https, #3020747
+
+ -- Herman van Rink <helmo@initfour.nl>  Sat, 22 Dec 2018 20:22:16 +0100
+
+aegir3-provision (3.170) unstable; urgency=high
+
+  * Bugfixes and UI improvements, see http://aegir.readthedocs.org/en/3.x/release-notes/3.17
+  * Fixes a number of security issues.
+  * Include Drupal 7.61
+
+ -- Herman van Rink <helmo@initfour.nl>  Wed, 19 Dec 2018 16:50:53 +0100
+
 aegir3-provision (3.161) testing; urgency=medium
 
   * Minor bugfix release

debian/control

@@ -11,7 +11,7 @@ Vcs-browser: http://drupalcode.org/project/provision.git
 
 Package: aegir3-provision
 Architecture: all
-Depends: ${misc:Depends}, php5-cli (>= 5.3) | php7.0-cli | php7.1-cli | php7.2-cli, php5 | php7.0-xml | php7.1-xml | php7.2-xml, php5-mysql | php7.0-mysql | php7.1-mysql | php7.2-mysql, mysql-client | mariadb-client, sudo, postfix | mail-transport-agent, apache2 | nginx, adduser, ucf, curl
+Depends: ${misc:Depends}, php5-cli (>= 5.3) | php7.0-cli | php7.1-cli | php7.2-cli | php-cli,  php5 | php7.0-xml | php7.1-xml | php7.2-xml | php-xml, php5-mysql | php7.0-mysql | php7.1-mysql | php7.2-mysql | php-mysql, mysql-client | mariadb-client, sudo, postfix | mail-transport-agent, apache2 | nginx, adduser, ucf, curl
 Recommends: mysql-server | mariadb-server, rsync, composer
 Conflicts: aegir-provision, aegir-provision2, aegir2-provision
 Replaces: aegir-provision, aegir-provision2, aegir2-provision
@@ -30,8 +30,8 @@ Description: mass Drupal hosting system - backend
 
 Package: aegir3-hostmaster
 Architecture: all
-Depends: ${misc:Depends}, php5-mysql | php7.0-mysql | php7.1-mysql | php7.2-mysql, php5-gd | php7.0-gd | php7.1-gd | php7.2-gd, apache2 | nginx, libapache2-mod-php5 | libapache2-mod-php7.0 | libapache2-mod-php7.1 | libapache2-mod-php7.2 | php5-fpm | php7.0-fpm | php7.1-fpm | php7.2-fpm,, aegir3-provision (>= ${source:Version}), git-core, unzip, lsb-base (>= 3.0-6)
-Recommends: php5 | php7.0 | php7.1 | php7.2
+Depends: ${misc:Depends}, php5-mysql | php7.0-mysql | php7.1-mysql | php7.2-mysql | php-mysql, php5-gd | php7.0-gd | php7.1-gd | php7.2-gd | php-gd, apache2 | nginx, libapache2-mod-php5 | libapache2-mod-php7.0 | libapache2-mod-php7.1 | libapache2-mod-php7.2 | libapache2-mod-php | php5-fpm | php7.0-fpm | php7.1-fpm | php7.2-fpm | php-fpm, aegir3-provision (>= ${source:Version}), git-core, unzip, lsb-base (>= 3.0-6)
+Recommends: php5 | php7.0 | php7.1 | php7.2 | php
 Conflicts: aegir-hostmaster, aegir-hostmaster2, aegir2-hostmaster
 Replaces: aegir-hostmaster, aegir-hostmaster2, aegir2-hostmaster
 Description: mass Drupal hosting system - frontend
@@ -69,8 +69,8 @@ Description: mass Drupal hosting system
 
 Package: aegir3-cluster-slave
 Architecture: all
-Depends: ${misc:Depends}, php5-mysql | php7.0-mysql | php7.1-mysql | php7.2-mysql, sudo, apache2, adduser, ucf, libapache2-mod-php5 | libapache2-mod-php7.0 | libapache2-mod-php7.1, libapache2-mod-php7.2, rsync, nfs-client, mysql-client
-Recommends: php5-gd | php7.0-gd | php7.1-gd | php7.2-gd, php5 | php7.0 | php7.1 | php7.2
+Depends: ${misc:Depends}, php5-mysql | php7.0-mysql | php7.1-mysql | php7.2-mysql | php-mysql, sudo, apache2, adduser, ucf, libapache2-mod-php5 | libapache2-mod-php7.0 | libapache2-mod-php7.1 | libapache2-mod-php7.2 | libapache2-mod-php, rsync, nfs-client, mysql-client, aegir3-provision
+Recommends: php5-gd | php7.0-gd | php7.1-gd | php7.2-gd, php5 | php7.0 | php7.1 | php7.2 | php
 Conflicts: aegir-cluster-slave, aegir-cluster-slave2, aegir2-cluster-slave, aegir3
 Replaces: aegir-cluster-slave, aegir-cluster-slave2, aegir2-cluster-slave
 Description: mass Drupal hosting system - slave backend

http/Provision/Config/Apache/Ssl/vhost_ssl.tpl.php

 
-<?php if ($this->ssl_enabled && $this->ssl_key) : ?>
+<?php if ($this->ssl_enabled && $this->ssl_key && $this->ssl_cert_ok) : ?>
 
   <VirtualHost <?php print "{$ip_address}:{$http_ssl_port}"; ?>>
   <?php if ($this->site_mail) : ?>
@@ -82,7 +82,7 @@ if ($this->redirection) {
     # Prevent direct reading of files in the private dir.
     # This is for Drupal7 compatibility, which would normally drop
     # a .htaccess in those directories, but we explicitly ignore those
-    <Directory "<?php print $this->site_path; ?>/private/" >
+    <Directory ~ "sites/.*/private">
       <Files *>
         SetHandler This_is_a_Drupal_security_line_do_not_remove
       </Files>

http/Provision/Config/Apache/platform.tpl.php

 <Directory <?php print $this->root; ?>>
     Order allow,deny
     Allow from all
-    Satisfy any
+    Satisfy All
     Require all granted
 
 <?php print $extra_config; ?>

http/Provision/Config/Apache/subdir.tpl.php

@@ -39,7 +39,7 @@ Alias /<?php print $subdir; ?> <?php print $this->root; ?>
 # Prevent direct reading of files in the private dir.
 # This is for Drupal7 compatibility, which would normally drop
 # a .htaccess in those directories, but we explicitly ignore those
-<Directory "<?php print $this->site_path; ?>/private/" >
+<Directory ~ "sites/.*/private">
    SetHandler This_is_a_Drupal_security_line_do_not_remove
    Deny from all
    Options None

http/Provision/Config/Apache/vhost.tpl.php

@@ -83,7 +83,7 @@ if ($this->redirection || $ssl_redirection) {
     # Prevent direct reading of files in the private dir.
     # This is for Drupal7 compatibility, which would normally drop
     # a .htaccess in those directories, but we explicitly ignore those
-    <Directory "<?php print $this->site_path; ?>/private/" >
+    <Directory ~ "sites/.*/private">
       <Files *>
         SetHandler This_is_a_Drupal_security_line_do_not_remove
       </Files>

http/Provision/Config/Http/Ssl/Site.php

@@ -9,12 +9,11 @@
 class Provision_Config_Http_Ssl_Site extends Provision_Config_Http_Site {
   public $template = 'vhost_ssl.tpl.php';
   public $disabled_template = 'vhost_ssl_disabled.tpl.php';
+  public $ssl_cert_ok = TRUE;
 
   public $description = 'encrypted virtual host configuration';
 
   function write() {
-    parent::write();
-
     if ($this->ssl_enabled && $this->ssl_key) {
       $path = dirname($this->data['ssl_cert']);
       // Make sure the ssl.d directory in the server ssl.d exists. 
@@ -28,28 +27,39 @@ class Provision_Config_Http_Ssl_Site extends Provision_Config_Http_Site {
       // XXX: test. data structure may not be sound. try d($this->uri)
       // if $this fails
       Provision_Service_http_ssl::assign_certificate_site($this->ssl_key, $this);
-
+      
       // Copy the certificates to the server's ssl.d directory.
-      provision_file()->copy(
-        $this->data['ssl_cert_source'],
-        $this->data['ssl_cert'])
-        || drush_set_error('SSL_CERT_COPY_FAIL', dt('failed to copy SSL certificate in place'));
-      provision_file()->copy(
-        $this->data['ssl_cert_key_source'],
-        $this->data['ssl_cert_key'])
-        || drush_set_error('SSL_KEY_COPY_FAIL', dt('failed to copy SSL key in place'));
+      if (!provision_file()->copy($this->data['ssl_cert_source'], $this->data['ssl_cert'])->status()) {
+        drush_set_error('SSL_CERT_COPY_FAIL', dt('failed to copy SSL certificate in place'));
+        $this->ssl_cert_ok = FALSE;
+      }
+      if (!provision_file()->copy($this->data['ssl_cert_key_source'], $this->data['ssl_cert_key'])->status()) {
+        drush_set_error('SSL_KEY_COPY_FAIL', dt('failed to copy SSL key in place'));
+        $this->ssl_cert_ok = FALSE;
+      }
       // Copy the chain certificate, if it is set.
       if (!empty($this->data['ssl_chain_cert_source'])) {
-	      provision_file()->copy(
-          $this->data['ssl_chain_cert_source'],
-          $this->data['ssl_chain_cert'])
-        || drush_set_error('SSL_CHAIN_COPY_FAIL', dt('failed to copy SSL certficate chain in place'));
+        if (!provision_file()->copy($this->data['ssl_chain_cert_source'], $this->data['ssl_chain_cert'])->status()) {
+          drush_set_error('SSL_CHAIN_COPY_FAIL', dt('failed to copy SSL certficate chain in place'));
+          $this->ssl_cert_ok = FALSE;
+        }
       }
+
+      // If cert is not ok, turn off ssl_redirection.
+      if ($this->ssl_cert_ok == FALSE) {
+        $this->data['ssl_redirection'] = FALSE;
+        drush_log(dt('SSL Certificate preparation failed. SSL has been disabled for this site.'), 'warning');
+      }
+
       // Sync the key directory to the remote server.
       $this->data['server']->sync($path, array(
        'exclude' => "{$path}/*.receipt",  // Don't need to synch the receipts
      ));
     }
+
+    // Call parent's write AFTER ensuring the certificates are in place to prevent
+    // the vhost from referencing missing files.
+    parent::write();
   }
 
   /**

install.hostmaster.inc

@@ -264,6 +264,11 @@ function drush_provision_hostmaster_install($site = NULL) {
     'client_email' => drush_get_option('client_email'),
     'profile' => $profile,
     'drush_aliases' => 'hm',
+    'command-specific' => array (
+      'pm-download' => array (
+        'use-site-dir' => 1,
+      ),
+    ),
   ));
 
   drush_log('Starting with the hostmaster frontend installation.', 'notice');

migrate.hostmaster.inc

@@ -146,6 +146,11 @@ We are making the following assumptions:
       'uri' => $site,
       'profile' => 'hostmaster',
       'drush_aliases' => 'hm',
+      'command-specific' => array (
+        'pm-download' => array (
+          'use-site-dir' => 1,
+        ),
+      ),
     ));
     provision_backend_invoke($site_name, 'provision-verify');
     drush_set_option('site_name', $site_name);

platform/delete.provision.inc

@@ -48,8 +48,12 @@ function drush_provision_drupal_provision_delete() {
       drush_set_error(dt('Existing sites were found on this platform. These sites will need to be deleted before this platform can be deleted.'));
     }
     else {
+      drush_invoke_process('@none', 'provision-save', array(d()->name), array('delete' => TRUE));
       _provision_recursive_delete(d()->root);
       d()->service('http')->sync(d()->root);
     }
   }
+  elseif (d()->type === 'server') {
+    drush_invoke_process('@none', 'provision-save', array(d()->name), array('delete' => TRUE));
+  }
 }

platform/drupal/install_6.inc

@@ -366,8 +366,14 @@ function install_main() {
   $client_email = install_validate_client_email(drush_get_option('client_email', FALSE));
 
   $account = install_create_admin_user($client_email);
-  $onetime = user_pass_reset_url($account);
-  // Store the one time login link in an option so the front end can direct the user to their new site.
+
+  // If a redirect is defined, the symlink to the alias needs to exist before
+  // we generate the login link, below.
+  _provision_drupal_maintain_aliases();
+
+  // Store the one time login link in an option so the front end can direct the
+  // user to their new site.
+  $onetime = provision_generate_login_reset();
   drush_set_option('login_link', $onetime . '/login');
   drush_log(dt('Login url: !onetime', array('!onetime' => $onetime . '/login')), 'success');
 

platform/drupal/install_7.inc

@@ -158,10 +158,16 @@ function install_main() {
   _provision_drupal_create_directories();
 
   $account = user_load(1);
-  $onetime = user_pass_reset_url($account);
-  // Store the one time login link in an option so the front end can direct the user to their new site.
-  drush_set_option('login_link', $onetime . '/login');
-  drush_log(dt('Login url: !onetime', array('!onetime' => $onetime . '/login')), 'success');
+
+  // If a redirect is defined, the symlink to the alias needs to exist before
+  // we generate the login link, below.
+  _provision_drupal_maintain_aliases();
+
+  // Store the one time login link in an option so the front end can direct the
+  // user to their new site.
+  $onetime = provision_generate_login_reset();
+  drush_set_option('login_link', $onetime);
+  drush_log(dt('Login url: !onetime', array('!onetime' => $onetime)), 'success');
 
   if (drush_get_option('client_email', FALSE)) {
     install_send_welcome_mail($url, $account, $install_locale, $client_email, $onetime);

platform/drupal/install_8.inc

@@ -159,8 +159,13 @@ function install_main() {
 
   $account = user_load(1);
 
-  $onetime = user_pass_reset_url($account);
-  // Store the one time login link in an option so the front end can direct the user to their new site.
+  // If a redirect is defined, the symlink to the alias needs to exist before
+  // we generate the login link, below.
+  _provision_drupal_maintain_aliases();
+
+  // Store the one time login link in an option so the front end can direct the
+  // user to their new site.
+  $onetime = provision_generate_login_reset();
   drush_set_option('login_link', $onetime);
   drush_log(dt('Login url: !onetime', array('!onetime' => $onetime)), 'message');
 

platform/provision_drupal.drush.inc

@@ -108,7 +108,9 @@ function provision_drupal_push_site($override_slave_authority = FALSE) {
   ));
 
   // Sync the platform
-  d()->service('http')->sync(d()->root, array('exclude-sites' => TRUE));
+  $sync_path = d()->root;
+  drush_command_invoke_all_ref('provision_platform_sync_path_alter', $sync_path, d());
+  d()->service('http')->sync($sync_path, array('exclude-sites' => TRUE));
 
   if (d()->type === 'site') {
     // Check whether we're hosted on a cluster, in which case, the master is
@@ -168,8 +170,12 @@ function provision_drupal_fetch_site($alias = NULL) {
  * Generate a settings file for the site.
  */
 function _provision_drupal_create_settings_file() {
-  $config = new Provision_Config_Drupal_Settings(d()->name, drush_get_context('site'));
-  $config->write();
+  $name = d()->name;
+  $context = drush_get_context('site');
+  $settings = new Provision_Config_Drupal_Settings($name, $context);
+  $settings->write();
+  $services = new Provision_Config_Drupal_Services($name, $context);
+  $services->write();
 }
 
 /**
@@ -593,6 +599,16 @@ function _provision_drupal_find_modules($scope, $key = '') {
       $source = file_get_contents(trim($install_file));
       $source = str_replace("\r\n", "\n", $source);
       $source = str_replace("\r", "\n", $source);
+      // Also search included files for function signature
+      $include_matches = array();
+      preg_match_all('!^\s*(include|require)(_once)?[\s\.\w\(]+([\'\"]{1}([\\\s\w\-\.\/]*)[\'\"]{1})!m', $source, $include_matches);
+      if (sizeof($include_matches[0])) {
+        foreach($include_matches[4] as $include) {
+          if ($include_file = realpath(dirname($info->filename) . DIRECTORY_SEPARATOR . $include)) {
+            $source .= "\n" . file_get_contents($include_file);
+          }
+        }
+      }
       $function_matches = array();
         preg_match_all('!function\s*&?([a-zA-Z0-9_]+)_update_([0-9]+)\s*\(.*?\s*\{!', $source, $function_matches);
 

platform/reset.login.provision.inc

@@ -15,9 +15,9 @@
  * Generate a one-time login reset url
  */
 function drush_provision_drupal_provision_login_reset() {
-  // pass the login link to the front end
-  drush_set_option('browser', FALSE);
-  $onetime = drush_user_login();
-  drush_set_option('login_link', $onetime);
-  drush_log(dt('Login url: !onetime', array('!onetime' => $onetime)), 'success');
+  $uri = d()->redirection ?: d()->uri;
+  $result = drush_invoke_process(d()->name, 'user-login', array(), array('uri' => $uri, 'no-browser' => TRUE));
+
+  drush_set_option('login_link', $result['output']);
+  drush_log(dt('Login url: !onetime', array('!onetime' => $result['output'])), 'success');
 }

provision.drush.inc

@@ -491,3 +491,12 @@ function provision_hosting_feature_enabled($feature) {
   return array_key_exists($feature, $features) && $features[$feature];
 }
 
+/**
+ * Generate one-time login link
+ */
+function provision_generate_login_reset() {
+  $uri = d()->redirection ?: d()->uri;
+  $result = drush_invoke_process(d()->name, 'user-login', array(), array('uri' => $uri, 'no-browser' => TRUE));
+
+  return $result['output'];
+}

provision.inc

@@ -460,7 +460,7 @@ function provision_backend_invoke($target, $command, $arguments = array(), $data
  * @return string|void
  *   The output or error output of the command.
  */
-function provision_process($command, $cwd = null, $label = 'Process', $env = array(), $log_output = TRUE, $error_message = NULL, $throw_drush_error = TRUE) {
+function provision_process($command, $cwd = null, $label = 'Process', $env = array(), $log_output = TRUE, $error_message = NULL, $throw_drush_error = TRUE, $log_type = 'p_info') {
   if (empty($command)) {
     return;
   }
@@ -481,8 +481,8 @@ function provision_process($command, $cwd = null, $label = 'Process', $env = arr
   if ($log_output) {
     drush_log("[$label] $command", 'p_command');
 
-    $exit_code = $process->run(function ($type, $buffer) {
-      drush_log($buffer, 'p_info');
+    $exit_code = $process->run(function ($type, $buffer) use ($log_type) {
+      drush_log($buffer, $log_type);
     });
   }
   else {
@@ -508,7 +508,7 @@ function provision_process($command, $cwd = null, $label = 'Process', $env = arr
     }
 
     if ($throw_drush_error) {
-      drush_set_error('PROVISION_PROCESS_ERROR', dt($error_message));
+      drush_set_error('PROVISION_PROCESS_ERROR', !empty($error_message)? $error_message: $process->getErrorOutput());
     }
     return $process->getErrorOutput();
   }

scripts/ci-aegir-dev-install-apt-ubuntu-artful.sh → scripts/ci-aegir-dev-install-apt-debian10.sh

@@ -2,20 +2,20 @@
 # Install Aegir debian packages located in the 'build/' directory.
 # These are provided by the GitLab CI build stage.
 #
-# This script is tuned for Ubuntu 17.10.
+# This script is tuned for Debian 9 - Stretch.
 #
+
 echo "[CI] Updating APT"
 sudo apt-get update
 
 echo "[CI] Setting debconf settings"
-echo "debconf debconf/frontend select Noninteractive" | debconf-set-selections
-#echo "debconf debconf/priority select critical" | debconf-set-selections