diff --git a/http/apache/apache_service.inc b/http/apache/apache_service.inc index 9642508880c3bf79ac6236696fb73a34f829e0fd..1c4ddbf1512410cb655e7e7ee2962dfe4a3f8069 100644 --- a/http/apache/apache_service.inc +++ b/http/apache/apache_service.inc @@ -59,8 +59,8 @@ class provisionService_http_apache extends provisionService_http { } function parse_configs($cause_error = FALSE) { - //This is required to be configurable, due to the fact that different hosts might need to do this differently. - //TODO : test for this instead of relying on a configuration setting? + // This is required to be configurable, due to the fact that different + // hosts might need to do this differently. $return = drush_shell_exec(escapeshellcmd(drush_get_option('restart_cmd'))); if (!$return) { $msg = join("\n", drush_shell_exec_output()); diff --git a/provision.drush.inc b/provision.drush.inc index 7289d4d830b9a684dc1c6dd17e06062d8b0c6172..9631a21f25c7f8e2adea83733eecbe4043fcdc09 100644 --- a/provision.drush.inc +++ b/provision.drush.inc @@ -237,14 +237,15 @@ function drush_http_provision_named_context_save() { } function _provision_default_restart_cmd() { - $command = '/usr/sbin/apachectl'; # a proper default for most of the world + $command = '/usr/sbin/apachectl'; // A proper default for most of the world foreach (explode(':', $_SERVER['PATH']) as $path) { $options[] = "$path/apache2ctl"; $options[] = "$path/apachectl"; } - # try to detect the apache restart command - $options[] = '/usr/local/sbin/apachectl'; # freebsd - $options[] = '/usr/sbin/apache2ctl'; # debian + apache2 + // Try to detect the apache restart command. + $options[] = '/usr/local/sbin/apachectl'; // freebsd + $options[] = '/usr/sbin/apache2ctl'; // debian + apache2 + $options[] = '/usr/apache2/2.2/bin'; // Solaris $options[] = $command; foreach ($options as $test) {