diff -urp a/provision/http/apache/server.tpl.php b/provision/http/apache/server.tpl.php --- a/provision/http/apache/server.tpl.php 2010-10-09 12:42:09.000000000 +0000 +++ b/provision/http/apache/server.tpl.php 2010-10-09 12:48:33.000000000 +0000 @@ -19,7 +19,7 @@ NameVirtualHost *: +Include # virtual hosts Include diff -urp a/provision/http/http.drush.inc b/provision/http/http.drush.inc --- a/provision/http/http.drush.inc 2010-10-09 12:42:09.000000000 +0000 +++ b/provision/http/http.drush.inc 2010-10-09 12:45:56.000000000 +0000 @@ -59,7 +59,7 @@ class provisionService_http_public exten function config_data($config = null, $class = null) { $data = parent::config_data($config, $class); if (!is_null($this->application_name)) { - $data['http_pred_path'] = $this->server->http_pred_path; + $data['http_confd_path'] = $this->server->http_confd_path; $data['http_postd_path'] = $this->server->http_postd_path; $data['http_platformd_path'] = $this->server->http_platformd_path; $data['http_vhostd_path'] = $this->server->http_vhostd_path; @@ -110,7 +110,7 @@ class provisionService_http_public exten if (!is_null($this->application_name)) { $app_dir = "{$this->server->config_path}/{$this->application_name}"; - $this->server->http_pred_path = "{$app_dir}/pre.d"; + $this->server->http_confd_path = "{$app_dir}/conf.d"; $this->server->http_postd_path = "{$app_dir}/post.d"; $this->server->http_platformd_path = "{$app_dir}/platform.d"; $this->server->http_vhostd_path = "{$app_dir}/vhost.d"; @@ -129,8 +129,8 @@ class provisionService_http_public exten function verify_server_cmd() { if (!is_null($this->application_name)) { - provision_file()->create_dir($this->server->http_pred_path, dt("Webserver custom pre-configuration"), 0700); - $this->sync($this->server->http_pred_path); + provision_file()->create_dir($this->server->http_confd_path, dt("Webserver custom configuration"), 0700); + $this->sync($this->server->http_confd_path); provision_file()->create_dir($this->server->http_postd_path, dt("Webserver custom post-configuration"), 0700); $this->sync($this->server->http_postd_path); diff -urp a/provision/http/nginx/server.tpl.php b/provision/http/nginx/server.tpl.php --- a/provision/http/nginx/server.tpl.php 2010-10-09 12:42:09.000000000 +0000 +++ b/provision/http/nginx/server.tpl.php 2010-10-09 12:47:03.000000000 +0000 @@ -103,7 +103,7 @@ server { ####################################################### # virtual hosts -include /*; +include /*; include /*; include /*; include /*;