From 1a9c5f162f93d536d764f89e74d6871965b6a4e7 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Wed, 13 Mar 2013 08:18:15 +0100 Subject: [PATCH] respect ip/port-default-vhost-config-for-every-domain and system-defaultvhost-conf setting in nginx and lighttpd, fixes #916 Signed-off-by: Michael Kaufmann (d00p) --- scripts/jobs/cron_tasks.inc.http.20.lighttpd.php | 9 +++++++++ scripts/jobs/cron_tasks.inc.http.30.nginx.php | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php index f73623dc..049181fd 100644 --- a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php +++ b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php @@ -489,6 +489,15 @@ class lighttpd if ($domain['specialsettings'] != "") { $vhost_content.= $domain['specialsettings'] . "\n"; } + + if ($ipandport['default_vhostconf_domain'] != '') { + $vhost_content.= $ipandport['default_vhostconf_domain'] . "\n"; + } + + if ($this->settings['system']['default_vhostconf'] != '') { + $vhost_content.= $this->settings['system']['default_vhostconf'] . "\n"; + } + $vhost_content.= '}' . "\n"; return $vhost_content; diff --git a/scripts/jobs/cron_tasks.inc.http.30.nginx.php b/scripts/jobs/cron_tasks.inc.http.30.nginx.php index c8fa5791..60cd5422 100644 --- a/scripts/jobs/cron_tasks.inc.http.30.nginx.php +++ b/scripts/jobs/cron_tasks.inc.http.30.nginx.php @@ -455,6 +455,15 @@ class nginx if ($domain['specialsettings'] != "") { $vhost_content.= $domain['specialsettings'] . "\n"; } + + if ($ipandport['default_vhostconf_domain'] != '') { + $vhost_content.= $ipandport['default_vhostconf_domain'] . "\n"; + } + + if ($this->settings['system']['default_vhostconf'] != '') { + $vhost_content.= $this->settings['system']['default_vhostconf'] . "\n"; + } + } } $vhost_content.= '}' . "\n\n";