Commit 09d1f8fa authored by omega8cc's avatar omega8cc Committed by helmo

Fix for relative paths expected.

parent 8a7ba0e4
...@@ -139,10 +139,10 @@ if (isset($_SERVER['db_name'])) { ...@@ -139,10 +139,10 @@ if (isset($_SERVER['db_name'])) {
$drupal_hash_salt = ''; $drupal_hash_salt = '';
<?php endif; ?> <?php endif; ?>
<?php if (isset($config_directories_active_var)): ?> <?php if (isset($config_directories_active_var)): ?>
$config_directories['active'] = 'sites/<?php print $this->uri ?>/private/config/active'; $config_directories['active'] = 'private/config/active';
<?php endif; ?> <?php endif; ?>
<?php if (isset($config_directories_staging_var)): ?> <?php if (isset($config_directories_staging_var)): ?>
$config_directories['staging'] = 'sites/<?php print $this->uri ?>/private/config/staging'; $config_directories['staging'] = 'private/config/staging';
<?php endif; ?> <?php endif; ?>
$conf['clean_url'] = 1; $conf['clean_url'] = 1;
$conf['aegir_api'] = <?php print !$this->backup_in_progress ? $this->api_version : 0 ?>; $conf['aegir_api'] = <?php print !$this->backup_in_progress ? $this->api_version : 0 ?>;
......
...@@ -233,14 +233,17 @@ function _provision_drupal_create_directories($url = NULL) { ...@@ -233,14 +233,17 @@ function _provision_drupal_create_directories($url = NULL) {
$chgrp["sites/$url/files/styles"] = d('@server_master')->web_group; $chgrp["sites/$url/files/styles"] = d('@server_master')->web_group;
// d8 support // d8 support
$mkdir["sites/$url/private/config"] = 02770; $mkdir["sites/$url/files/private"] = 02770;
$chgrp["sites/$url/private/config"] = d('@server_master')->web_group; $chgrp["sites/$url/files/private"] = d('@server_master')->web_group;
$mkdir["sites/$url/private/config/active"] = 02770; $mkdir["sites/$url/files/private/config"] = 02770;
$chgrp["sites/$url/private/config/active"] = d('@server_master')->web_group; $chgrp["sites/$url/files/private/config"] = d('@server_master')->web_group;
$mkdir["sites/$url/private/config/staging"] = 02770; $mkdir["sites/$url/files/private/config/active"] = 02770;
$chgrp["sites/$url/private/config/staging"] = d('@server_master')->web_group; $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;
} }
// These paths should not have recursive operations performed on them. // These paths should not have recursive operations performed on them.
...@@ -259,9 +262,10 @@ function _provision_drupal_create_directories($url = NULL) { ...@@ -259,9 +262,10 @@ function _provision_drupal_create_directories($url = NULL) {
"sites/$url/private/files", "sites/$url/private/files",
"sites/$url/private/temp", "sites/$url/private/temp",
"sites/$url/files/styles", "sites/$url/files/styles",
"sites/$url/private/config", "sites/$url/files/private",
"sites/$url/private/config/active", "sites/$url/files/private/config",
"sites/$url/private/config/staging" "sites/$url/files/private/config/active",
"sites/$url/files/private/config/staging"
); );
// Allow other commands to add or alter the directories to be created. // 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