summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBarracuda Team2012-09-16 12:32:37 (GMT)
committerHerman van Rink2013-09-25 08:43:01 (GMT)
commit1382b87ee479100ea17d06c0d53469f0a6a9f705 (patch)
tree2f0050bc50278cc88aa345ac619e555b96f8fff8
parent6b2df104f51151fda83f499ea5c9ad1c3149b76f (diff)
Update D8 config files management.
-rw-r--r--Provision/Config/Drupal/provision_drupal_settings.tpl.php6
-rw-r--r--platform/provision_drupal.drush.inc21
2 files changed, 13 insertions, 14 deletions
diff --git a/Provision/Config/Drupal/provision_drupal_settings.tpl.php b/Provision/Config/Drupal/provision_drupal_settings.tpl.php
index a70754e..0177abb 100644
--- a/Provision/Config/Drupal/provision_drupal_settings.tpl.php
+++ b/Provision/Config/Drupal/provision_drupal_settings.tpl.php
@@ -135,10 +135,12 @@ if (isset($_SERVER['db_name'])) {
$drupal_hash_salt = '';
<?php endif; ?>
<?php if (isset($config_directories_active_var)): ?>
- $config_directories['active'] = 'private/config/active';
+ $config_directories['active']['path'] = 'sites/<?php print $this->uri ?>/private/config/active';
+ $config_directories['active']['absolute'] = TRUE;
<?php endif; ?>
<?php if (isset($config_directories_staging_var)): ?>
- $config_directories['staging'] = 'private/config/staging';
+ $config_directories['staging']['path'] = 'sites/<?php print $this->uri ?>/private/config/staging';
+ $config_directories['staging']['absolute'] = TRUE;
<?php endif; ?>
$conf['clean_url'] = 1;
$conf['aegir_api'] = <?php print !$this->backup_in_progress ? $this->api_version : 0 ?>;
diff --git a/platform/provision_drupal.drush.inc b/platform/provision_drupal.drush.inc
index aa3ed4e..58756ed 100644
--- a/platform/provision_drupal.drush.inc
+++ b/platform/provision_drupal.drush.inc
@@ -238,17 +238,14 @@ function _provision_drupal_create_directories($url = NULL, $profile = NULL) {
$chgrp["sites/$url/files/styles"] = d('@server_master')->web_group;
// d8 support
- $mkdir["sites/$url/files/private"] = 02770;
- $chgrp["sites/$url/files/private"] = d('@server_master')->web_group;
+ $mkdir["sites/$url/private/config"] = 02770;
+ $chgrp["sites/$url/private/config"] = d('@server_master')->web_group;
- $mkdir["sites/$url/files/private/config"] = 02770;
- $chgrp["sites/$url/files/private/config"] = d('@server_master')->web_group;
+ $mkdir["sites/$url/private/config/active"] = 02770;
+ $chgrp["sites/$url/private/config/active"] = d('@server_master')->web_group;
- $mkdir["sites/$url/files/private/config/active"] = 02770;
- $chgrp["sites/$url/files/private/config/active"] = d('@server_master')->web_group;
-
- $mkdir["sites/$url/files/private/config/staging"] = 02770;
- $chgrp["sites/$url/files/private/config/staging"] = d('@server_master')->web_group;
+ $mkdir["sites/$url/private/config/staging"] = 02770;
+ $chgrp["sites/$url/private/config/staging"] = d('@server_master')->web_group;
}
// These paths should not have recursive operations performed on them.
@@ -268,9 +265,9 @@ function _provision_drupal_create_directories($url = NULL, $profile = NULL) {
"sites/$url/private/temp",
"sites/$url/files/styles",
"sites/$url/files/private",
- "sites/$url/files/private/config",
- "sites/$url/files/private/config/active",
- "sites/$url/files/private/config/staging"
+ "sites/$url/private/config",
+ "sites/$url/private/config/active",
+ "sites/$url/private/config/staging"
);
// Allow other commands to add or alter the directories to be created.