Commit 36747374 authored by drumm's avatar drumm Committed by Neil Drumm

Align service type option names

parent 08a2964d
......@@ -11,7 +11,7 @@
include_once(dirname(__FILE__) . '/../provision.service.inc');
function db_provision_services() {
return array('db' => 'mysql');
return array('db' => NULL);
}
function db_drush_exit() {
......@@ -268,7 +268,7 @@ class provisionService_db extends provisionService {
* Write out server's drushrc alias file.
*/
function context_options() {
return array('provision-service-db', 'master_db');
return array('master_db');
}
}
......
......@@ -4,7 +4,7 @@ include_once(dirname(__FILE__) . '/../provision.service.inc');
function http_provision_services() {
return array('http' => 'apache');
return array('http' => NULL);
}
......@@ -75,6 +75,6 @@ class provisionService_http extends provisionService {
* Write out server's drushrc alias file.
*/
function context_options() {
return array('provision-service-http', 'web_ports', 'web_group', 'restart_cmd');
return array('web_ports', 'web_group', 'restart_cmd');
}
}
......@@ -264,10 +264,14 @@ class provisionServer extends provisionEnvironment {
* Options this environment will save in its context file.
*/
function context_options() {
return array_merge(
$options = array_merge(
array('provision-host', 'provision-user', 'config_path', 'backup_path'),
d()->services_invoke('context_options')
);
foreach (array_keys($this->services) as $service) {
$options[] = $service . '-service-type';
}
return $options;
}
}
......
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