Commit 68f98302 authored by Adrian Rossouw's avatar Adrian Rossouw Committed by adrian
Browse files

Do not create the platform_.conf file if no platform ID is present. this...

Do not create the platform_.conf file if no platform ID is present. this resolves the last minor issue with the upgrade path
parent 835bcbe4
...@@ -3,11 +3,16 @@ ...@@ -3,11 +3,16 @@
function drush_provision_apache_provision_verify($url = null) { function drush_provision_apache_provision_verify($url = null) {
if (PROVISION_CONTEXT_PLATFORM) { if (PROVISION_CONTEXT_PLATFORM) {
_provision_create_dir(drush_get_option('vhost_path'), dt("Virtual host configuration"), 0700); _provision_create_dir(drush_get_option('vhost_path'), dt("Virtual host configuration"), 0700);
$data = drush_get_merged_options();
$options = drush_get_merged_options(); if (drush_get_option('platform', null)) {
$data['extra_config'] = "# Extra configuration from modules:\n"; // only create a platform level config if the platform is specified
$data['extra_config'] .= join("\n", drush_command_invoke_all('provision_apache_dir_config', $data)); $data = drush_get_merged_options();
_provision_apache_create_config('platform_' . $options['platform'] . '.conf', $data, _provision_apache_platform_template()); $options = drush_get_merged_options();
$data['extra_config'] = "# Extra configuration from modules:\n";
$data['extra_config'] .= join("\n", drush_command_invoke_all('provision_apache_dir_config', $data));
_provision_apache_create_config('platform_' . $options['platform'] . '.conf', $data, _provision_apache_platform_template());
}
_provision_apache_create_server_config($url); _provision_apache_create_server_config($url);
} }
else { else {
......
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