Commit f7623833 authored by Jon Pugh's avatar Jon Pugh

Merge branch '7.x-3.x' of git.drupal.org:project/provision into 2754069-decouple-install-alternate

parents 098a60e4 3a2d77ad
......@@ -141,7 +141,7 @@ if (isset($_SERVER['db_name'])) {
$conf['file_directory_path'] = 'sites/<?php print $this->uri ?>/files';
$conf['file_directory_temp'] = 'sites/<?php print $this->uri ?>/private/temp';
$conf['clean_url'] = 1;
$conf['aegir_api'] = <?php print !$this->backup_in_progress ? $this->api_version : 0 ?>;
$conf['aegir_api'] = <?php print $this->api_version ? $this->api_version : 0 ?>;
$conf['allow_authorize_operations'] = FALSE;
// Nginx tries to cache the admin_menu if we don't do this.
......
......@@ -141,7 +141,7 @@ if (isset($_SERVER['db_name'])) {
$conf['file_temporary_path'] = 'sites/<?php print $this->uri ?>/private/temp';
$drupal_hash_salt = '';
$conf['clean_url'] = 1;
$conf['aegir_api'] = <?php print !$this->backup_in_progress ? $this->api_version : 0 ?>;
$conf['aegir_api'] = <?php print $this->api_version ? $this->api_version : 0 ?>;
$conf['allow_authorize_operations'] = FALSE;
// Nginx tries to cache the admin_menu if we don't do this.
......
......@@ -139,7 +139,7 @@ if (isset($_SERVER['db_name'])) {
$config['system.file']['path']['temporary'] = 'sites/<?php print $this->uri ?>/private/temp';
$config_directories[CONFIG_SYNC_DIRECTORY] = 'sites/<?php print $this->uri ?>/private/config/sync';
$settings['hash_salt'] = '<?php print $drupal_hash_salt_var ?>';
$settings['aegir_api'] = <?php print !$this->backup_in_progress ? $this->api_version : 0 ?>;
$settings['aegir_api'] = <?php print $this->api_version ? $this->api_version : 0 ?>;
$settings['allow_authorize_operations'] = FALSE;
/**
......
......@@ -20,6 +20,6 @@ print "# A list of paths that drush should include even when working outside\n";
print "# the context of the hostmaster site.\n";
print "\$options['include'] = ". var_export($drush_include, TRUE) . ";\n";
print "# Local non-aegir-generated additions.";
print "@include_once(dirname(__FILE__) . '/local.drushrc.php');";
print "# Local non-aegir-generated additions.\n";
print "@include_once(dirname(__FILE__) . '/local.drushrc.php');\n";
?>
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