Commit 252aa0c6 authored by omega8cc's avatar omega8cc

Keep up with D8 core - the config dir is now named sync - https://www.drupal.org/node/2487588

parent 7ac112aa
......@@ -35,7 +35,7 @@ class Provision_Config_Drupal_Settings extends Provision_Config {
$this->data['drupal_hash_salt_var'] = Drupal\Component\Utility\Crypt::randomBytesBase64(55);
$this->data['config_directories_active_var'] = 'config_directories_active';
$this->data['config_directories_staging_var'] = 'config_directories_staging';
$this->data['config_directories_sync_var'] = 'config_directories_sync';
}
elseif (drush_drupal_major_version() == 7) {
$this->template = 'provision_drupal_settings_7.tpl.php';
......
......@@ -141,8 +141,8 @@ if (isset($_SERVER['db_name'])) {
<?php if (isset($config_directories_active_var)): ?>
$config_directories['active'] = 'sites/<?php print $this->uri ?>/private/config/active';
<?php endif; ?>
<?php if (isset($config_directories_staging_var)): ?>
$config_directories['staging'] = 'sites/<?php print $this->uri ?>/private/config/staging';
<?php if (isset($config_directories_sync_var)): ?>
$config_directories['sync'] = 'sites/<?php print $this->uri ?>/private/config/sync';
<?php endif; ?>
$settings['aegir_api'] = <?php print !$this->backup_in_progress ? $this->api_version : 0 ?>;
$settings['allow_authorize_operations'] = FALSE;
......
......@@ -245,8 +245,8 @@ function _provision_drupal_create_directories($url = NULL) {
$mkdir["sites/$url/private/config/active"] = 02770;
$chgrp["sites/$url/private/config/active"] = d('@server_master')->web_group;
$mkdir["sites/$url/private/config/staging"] = 02770;
$chgrp["sites/$url/private/config/staging"] = d('@server_master')->web_group;
$mkdir["sites/$url/private/config/sync"] = 02770;
$chgrp["sites/$url/private/config/sync"] = d('@server_master')->web_group;
}
// These paths should not have recursive operations performed on them.
......@@ -268,7 +268,7 @@ function _provision_drupal_create_directories($url = NULL) {
"sites/$url/files/private",
"sites/$url/private/config",
"sites/$url/private/config/active",
"sites/$url/private/config/staging"
"sites/$url/private/config/sync"
);
// Allow other commands to add or alter the directories to be created,
......
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