Commit 1490988f authored by Adrian Rossouw's avatar Adrian Rossouw

Get http verify working

parent f775b1f6
...@@ -48,8 +48,8 @@ class provisionService_http_apache extends provisionService_http { ...@@ -48,8 +48,8 @@ class provisionService_http_apache extends provisionService_http {
function verify() { function verify() {
switch (d($this->owner)->type) { switch (d($this->owner)->type) {
case 'server': case 'server':
provision_service('file')->create_dir(drush_get_option('vhost_path'), dt("Virtual host configuration"), 0700); provision_service('file')->create_dir(drush_get_option('apache_site_conf_path'), dt("Virtual host configuration"), 0700);
provision_service('file')->create_dir(drush_get_option('platform_conf_path'), dt("Platforms configuration"), 0700); provision_service('file')->create_dir(drush_get_option('apache_platform_conf_path'), dt("Platforms configuration"), 0700);
provision_service('file')->create_dir(drush_get_option('config_path') . '/apache.d' , dt("Apache configuration"), 0700); provision_service('file')->create_dir(drush_get_option('config_path') . '/apache.d' , dt("Apache configuration"), 0700);
$this->create_server_config(); $this->create_server_config();
...@@ -70,7 +70,7 @@ class provisionService_http_apache extends provisionService_http { ...@@ -70,7 +70,7 @@ class provisionService_http_apache extends provisionService_http {
function parse_configs($cause_error = FALSE) { function parse_configs($cause_error = FALSE) {
// This is required to be configurable, due to the fact that different // This is required to be configurable, due to the fact that different
// hosts might need to do this differently. // hosts might need to do this differently.
if (drush_is_local_host(drush_get_option('web_host'))) { if (drush_is_local_host(drush_get_option('host-name', 'localhost'))) {
$return = drush_shell_exec(escapeshellcmd(drush_get_option('restart_cmd'))); $return = drush_shell_exec(escapeshellcmd(drush_get_option('restart_cmd')));
} }
else { else {
......
...@@ -61,7 +61,6 @@ include_once('provision.inc'); ...@@ -61,7 +61,6 @@ include_once('provision.inc');
*/ */
function provision_drush_init() { function provision_drush_init() {
d(drush_get_option('name', '@self', 'alias'), TRUE); d(drush_get_option('name', '@self', 'alias'), TRUE);
$load = sys_getloadavg(); $load = sys_getloadavg();
if (provision_load_critical($load)) { if (provision_load_critical($load)) {
drush_set_error('PROVISION_OVERLOAD', dt("load on system too heavy (@load), aborting", array('@load' => join(" ", $load)))); drush_set_error('PROVISION_OVERLOAD', dt("load on system too heavy (@load), aborting", array('@load' => join(" ", $load))));
......
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