Commit e3813c3c authored by drumm's avatar drumm Committed by Neil Drumm
Browse files

init_(db|http) -> provision-service-(db|http)

parent 115d394c
...@@ -270,7 +270,7 @@ class provisionService_db extends provisionService { ...@@ -270,7 +270,7 @@ class provisionService_db extends provisionService {
* Write out server's drushrc alias file. * Write out server's drushrc alias file.
*/ */
function write_alias() { function write_alias() {
return array(drush_get_option('init_db') => array('init_db', 'master_db')); return array(drush_get_option('provision-service-db') => array('provision-service-db', 'master_db'));
} }
} }
......
...@@ -99,6 +99,6 @@ class provisionService_http extends provisionService { ...@@ -99,6 +99,6 @@ class provisionService_http extends provisionService {
* Write out server's drushrc alias file. * Write out server's drushrc alias file.
*/ */
function write_alias() { function write_alias() {
return array(drush_get_option('init_http') => array('init_http', 'web_host', 'web_ports', 'web_group', 'restart_cmd')); return array(drush_get_option('provision-service-http') => array('provision-service-http', 'web_host', 'web_ports', 'web_group', 'restart_cmd'));
} }
} }
...@@ -37,8 +37,8 @@ function drush_provision_hostmaster_install($site) { ...@@ -37,8 +37,8 @@ function drush_provision_hostmaster_install($site) {
$data['master_db'] = "$scheme://$user:$pass@$host"; $data['master_db'] = "$scheme://$user:$pass@$host";
} }
$data['init_http'] = 'apache'; $data['provision-service-http'] = 'apache';
$data['init_db'] = 'mysql'; $data['provision-service-db'] = 'mysql';
$data['provision_context'] = 'server'; $data['provision_context'] = 'server';
$data['parent_path'] = $parent_path; $data['parent_path'] = $parent_path;
$data['script_user'] = drush_get_option('script_user', 'aegir'); $data['script_user'] = drush_get_option('script_user', 'aegir');
......
...@@ -87,9 +87,9 @@ function _provision_context_init() { ...@@ -87,9 +87,9 @@ function _provision_context_init() {
// Initialize services. // Initialize services.
foreach (array('db', 'http') as $service) { foreach (array('db', 'http') as $service) {
if (!is_null(drush_get_option('init_' . $service))) { if (!is_null(drush_get_option('provision-service-' . $service))) {
include_once(drush_get_option('init_' . $service) . '/'. drush_get_option('init_' . $service) .'_service.inc'); include_once dirname(__FILE__) . '/../' . $service . '/' . drush_get_option('provision-service-' . $service) . '/'. drush_get_option('provision-service-' . $service) .'_service.inc';
$class = 'provisionService_' . $service . '_' . drush_get_option('init_' . $service); $class = 'provisionService_' . $service . '_' . drush_get_option('provision-service-' . $service);
provision_service($service, new $class()); provision_service($service, new $class());
} }
} }
......
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