From 950c9d7373968b1dd97e43d18a00abe37b20d6d0 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Tue, 8 Jun 2010 06:16:48 +0000 Subject: [PATCH] - on ssl-redirect, only create webroot for vhost, fixes #254 --- .../jobs/cron_tasks.inc.http.20.lighttpd.php | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php index 8067219f..bda3585e 100644 --- a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php +++ b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php @@ -370,12 +370,20 @@ class lighttpd { mkDirWithCorrectOwnership($domain['customerroot'], $domain['documentroot'], $domain['guid'], $domain['guid'], true, true); + $only_webroot = false; + if($ssl_vhost === false && $domain['ssl_redirect'] == '1') + { + $only_webroot = true; + } $vhost_content.= $this->getWebroot($domain, $ssl_vhost); - $vhost_content.= $this->create_htaccess($domain); - $vhost_content.= $this->create_pathOptions($domain); - $vhost_content.= $this->composePhpOptions($domain); - $vhost_content.= $this->getStats($domain); - $vhost_content.= $this->getLogFiles($domain); + if(!$only_webroot) + { + $vhost_content.= $this->create_htaccess($domain); + $vhost_content.= $this->create_pathOptions($domain); + $vhost_content.= $this->composePhpOptions($domain); + $vhost_content.= $this->getStats($domain); + $vhost_content.= $this->getLogFiles($domain); + } } if ($domain['specialsettings'] != "") {