Commit 5baec74e authored by omega8cc's avatar omega8cc

Backport provision_hosting_feature_enabled (2)

parent 73ea4467
......@@ -86,8 +86,7 @@ if ($this->redirection || $ssl_redirection) {
<?php
$if_subsite = $this->data['http_subdird_path'] . '/' . $this->uri;
$if_subdirs = drush_get_option('hosting_features', array());
if (array_key_exists('subdirs', $if_subdirs) && $if_subdirs['subdirs'] && provision_file()->exists($if_subsite)->status()) {
if (provision_hosting_feature_enabled('subdirs') && provision_file()->exists($if_subsite)->status()) {
print " Include " . $if_subsite . "/*.conf\n";
}
?>
......
......@@ -68,8 +68,7 @@ else {
print " include " . $server->include_path . "/nginx_vhost_common.conf;\n";
}
$if_subsite = $this->data['http_subdird_path'] . '/' . $this->uri;
$if_subdirs = drush_get_option('hosting_features', array());
if (array_key_exists('subdirs', $if_subdirs) && $if_subdirs['subdirs'] && provision_file()->exists($if_subsite)->status()) {
if (provision_hosting_feature_enabled('subdirs') && provision_file()->exists($if_subsite)->status()) {
print " include " . $if_subsite . "/*.conf;\n";
}
?>
......
......@@ -17,8 +17,7 @@ class Provision_Service_http_apache extends Provision_Service_http_public {
$this->configs['server'][] = 'Provision_Config_Apache_Server';
$this->configs['platform'][] = 'Provision_Config_Apache_Platform';
$this->configs['site'][] = 'Provision_Config_Apache_Site';
$if_subdirs = drush_get_option('hosting_features', array());
if (array_key_exists('subdirs', $if_subdirs) && $if_subdirs['subdirs']) {
if (provision_hosting_feature_enabled('subdirs')) {
$this->configs['site'][] = 'Provision_Config_Apache_Subdir';
$this->configs['site'][] = 'Provision_Config_Apache_SubdirVhost';
}
......
......@@ -23,8 +23,7 @@ class Provision_Service_http_nginx extends Provision_Service_http_public {
$this->server->setProperty('provision_db_cloaking', TRUE);
$this->server->setProperty('phpfpm_mode', 'port');
$this->server->setProperty('subdirs_support', FALSE);
$if_subdirs = drush_get_option('hosting_features', array());
if (array_key_exists('subdirs', $if_subdirs) && $if_subdirs['subdirs']) {
if (provision_hosting_feature_enabled('subdirs')) {
$this->server->subdirs_support = TRUE;
$this->configs['site'][] = 'Provision_Config_Nginx_Subdir';
$this->configs['site'][] = 'Provision_Config_Nginx_SubdirVhost';
......@@ -77,8 +76,7 @@ class Provision_Service_http_nginx extends Provision_Service_http_public {
}
// Set correct subdirs_support value on server save
$if_subdirs = drush_get_option('hosting_features', array());
if (array_key_exists('subdirs', $if_subdirs) && $if_subdirs['subdirs']) {
if (provision_hosting_feature_enabled('subdirs')) {
$this->server->subdirs_support = TRUE;
}
}
......@@ -128,8 +126,7 @@ class Provision_Service_http_nginx extends Provision_Service_http_public {
}
// Set correct subdirs_support value on server verify
$if_subdirs = drush_get_option('hosting_features', array());
if (array_key_exists('subdirs', $if_subdirs) && $if_subdirs['subdirs']) {
if (provision_hosting_feature_enabled('subdirs')) {
$this->server->subdirs_support = TRUE;
}
......
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