maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

add nginx and lighttpd support, refactor into common base class

Browse Source
This commit is contained in:
Chris Vigelius
2015-07-06 14:15:01 +02:00
parent d9e0854bb7
commit de84419035
4 changed files with 100 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
scripts/jobs/cron_tasks.inc.http.20.lighttpd.php
View File

@@ -18,7 +18,9 @@
* @TODO ssl-redirect to non-standard port
*/
class lighttpd {
include('../classes/class.HttpConfigBase.php');
class lighttpd extends HttpConfigBase {
private $logger = false;
private $debugHandler = false;
private $idnaConvert = false;
@@ -145,7 +147,11 @@ class lighttpd {
}
if ($row_ipsandports['specialsettings'] != '') {
$this->lighttpd_data[$vhost_filename].= $row_ipsandports['specialsettings'] . "\n";
$this->lighttpd_data[$vhost_filename].= $this->processSpecialConfigTemplate(
$row_ipsandports['specialsettings'],
$row_ipsandports,
$domain
). "\n";
}
$this->lighttpd_data[$vhost_filename].= '}' . "\n";
@@ -439,15 +445,24 @@ class lighttpd {
$vhost_content.= $this->getSslSettings($domain, $ssl_vhost);
if ($domain['specialsettings'] != "") {
$vhost_content.= $domain['specialsettings'] . "\n";
$vhost_content.= $this->processSpecialConfigTemplate(
$domain['specialsettings'],
$ipandport,
$domain). "\n";
}
if ($ipandport['default_vhostconf_domain'] != '') {
$vhost_content.= $ipandport['default_vhostconf_domain'] . "\n";
$vhost_content.= $this->processSpecialConfigTemplate(
$ipandport['default_vhostconf_domain'],
$ipandport,
$domain) . "\n";
}
if (Settings::Get('system.default_vhostconf') != '') {
$vhost_content.= Settings::Get('system.default_vhostconf') . "\n";
$vhost_content.= $this->processSpecialConfigTemplate(
Settings::Get('system.default_vhostconf'),
$ipandport,
$domain). "\n";
}
}
$vhost_content.= $this->getLogFiles($domain);