Feature: Vhost templates

Reworked the initial implementation by hpmewes (https://github.com/Froxlor/Froxlor/pull/233) with
- bugfixes all over
- added support for apache and lighttpd also
- added an update sequence (instead of only modifying froxlor.sql)
- added english language variables
- added missing parts in admin_vhostsettings.php
- added parameter replacements as available since PR 244

scripts/jobs/cron_tasks.inc.http.20.lighttpd.php

@@ -164,7 +164,7 @@ class lighttpd extends HttpConfigBase {
 				}
 
 				if ($row_ipsandports['ssl_cert_file'] != '') {
-				    
+
 				    // check for existence, #1485
 				    if (!file_exists($row_ipsandports['ssl_cert_file'])) {
 				        $this->logger->logAction(CRON_ACTION, LOG_ERR, $ip.':'.$port . ' :: certificate file "'.$row_ipsandports['ssl_cert_file'].'" does not exist! Cannot create ssl-directives');
@@ -175,7 +175,7 @@ class lighttpd extends HttpConfigBase {
     					$this->lighttpd_data[$vhost_filename].= 'ssl.cipher-list = "' . Settings::Get('system.ssl_cipher_list') . '"' . "\n";
     					$this->lighttpd_data[$vhost_filename].= 'ssl.honor-cipher-order = "enable"' . "\n";
     					$this->lighttpd_data[$vhost_filename].= 'ssl.pemfile = "' . makeCorrectFile($row_ipsandports['ssl_cert_file']) . '"' . "\n";
-    
+
     					if ($row_ipsandports['ssl_ca_file'] != '') {
     					    // check for existence, #1485
     					    if (!file_exists($row_ipsandports['ssl_ca_file'])) {
@@ -455,6 +455,19 @@ class lighttpd extends HttpConfigBase {
 
 					$vhost_content.= $this->getSslSettings($domain, $ssl_vhost);
 
+					// check if vhost config template is set and if so, merge it
+					if ($domain['vhostsettingid'] != 0) {
+						$vhostsettings_stmt = Database::prepare("SELECT `description`, `vhostsettings` FROM " . TABLE_PANEL_VHOSTCONFIGS . " WHERE `id` = :id LIMIT 1;");
+						$vhostconfig = Database::pexecute_first($vhostsettings_stmt, array('id' => $domain['vhostsettingid']));
+
+						$vhost_content .= $this->processSpecialConfigTemplate(
+								$vhostconfig['vhostsettings'],
+								$domain,
+								$domain['ip'],
+								$domain['port'],
+								$ssl_vhost) . "\n";
+					}
+
 					if ($domain['specialsettings'] != "") {
 						$vhost_content.= $this->processSpecialConfigTemplate(
 								$domain['specialsettings'],
@@ -508,7 +521,7 @@ class lighttpd extends HttpConfigBase {
 			}
 
 			if ($domain['ssl_cert_file'] != '') {
-			    
+
 				$ssl_settings.= 'ssl.engine = "enable"' . "\n";
 				$ssl_settings.= 'ssl.use-sslv2 = "disable"' . "\n";
 				$ssl_settings.= 'ssl.cipher-list = "' . Settings::Get('system.ssl_cipher_list') . '"' . "\n";