Commit 66f2ca42 authored by Jon Pugh's avatar Jon Pugh

Merge branch '7.x-3.x' into 7.x-3.x-devshop

parents 542a17be 202c0eeb
......@@ -154,6 +154,13 @@ if (isset($_SERVER['db_name'])) {
<?php endif; ?>
<?php endif; ?>
/**
* If external request was HTTPS but internal request is HTTP, set $_SERVER['HTTPS'] so Drupal detects the right scheme.
*/
if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' && $_SERVER["REQUEST_SCHEME"] == 'http') {
$_SERVER['HTTPS'] = 'on';
}
<?php print $extra_config; ?>
# Additional host wide configuration settings. Useful for safely specifying configuration settings.
......
......@@ -162,6 +162,13 @@ if (isset($_SERVER['db_name'])) {
*/
$conf['syslog_identity'] = '<?php print $this->uri ?>';
/**
* If external request was HTTPS but internal request is HTTP, set $_SERVER['HTTPS'] so Drupal detects the right scheme.
*/
if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' && $_SERVER["REQUEST_SCHEME"] == 'http') {
$_SERVER['HTTPS'] = 'on';
}
<?php print $extra_config; ?>
# Additional host wide configuration settings. Useful for safely specifying configuration settings.
......
......@@ -184,6 +184,13 @@ if (isset($_SERVER['db_name'])) {
*/
$config['syslog.settings']['identity'] = '<?php print $this->uri ?>';
/**
* If external request was HTTPS but internal request is HTTP, set $_SERVER['HTTPS'] so Drupal detects the right scheme.
*/
if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' && $_SERVER["REQUEST_SCHEME"] == 'http') {
$_SERVER['HTTPS'] = 'on';
}
<?php print $extra_config; ?>
# Additional host wide configuration settings. Useful for safely specifying configuration settings.
......
aegir3-provision (3.183) testing; urgency=medium
* New mini-release required for update to Debian repo PGP key (https://www.drupal.org/project/hostmaster/issues/3085544)
* 3.181ubuntu1 was missing the actual commit.
-- Herman van Rink <helmo@initfour.nl> Tue, 08 Oct 2019 22:41:17 +0200
aegir3-provision (3.182) testing; urgency=medium
* Mini-release to update the bundled dehydrated lib for LetsEncrypt.
......
......@@ -157,7 +157,8 @@ function drush_provision_drupal_pre_provision_verify() {
_provision_drupal_create_settings_file();
// If this is the hostmaster site, save the ~/.drush/drushrc.php file.
if (d()->root == d('@hostmaster')->root && d()->uri == d('@hostmaster')->uri) {
$hostmaster = provision_sitealias_get_record('@hostmaster');
if (d()->root == $hostmaster['root'] && d()->uri == $hostmaster['uri']) {
$aegir_drushrc = new Provision_Config_Drushrc_Aegir();
$aegir_drushrc->write();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment