- Enhanced the installation guides

- added a daily cronjob for stats creation in the installer.
- Fixed a bug in the spamfilter white / blacklist forms (thanks to satommy for reporting this)
- fixed ssl cert path in vhost templates/web_domain_ssl.htm
- fixed a bug in the apache plugin which prevented the copying of the standard error and index files.

Author: tbrehm

INSTALL_DEBIAN.txt

@@ -29,6 +29,7 @@ Then run the following to enable the Apache modules:
 
 a2enmod suexec
 a2enmod rewrite
+a2enmod ssl
 
 4) Install pure-ftpd and quota
 

INSTALL_UBUNTU.txt

@@ -41,6 +41,7 @@ Then run the following to enable the Apache modules:
 
 a2enmod suexec
 a2enmod rewrite
+a2enmod ssl
 
 4) Install pure-ftpd and quota
 

install/lib/installer_base.lib.php

@@ -648,7 +648,10 @@ public function install_crontab()
 		exec('crontab -u root -l > crontab.txt');
 		$existing_root_cron_jobs = file('crontab.txt');
 
-		$root_cron_jobs = array('* * * * * /usr/local/ispconfig/server/server.sh &> /dev/null');
+		$root_cron_jobs = array(
+			'* * * * * /usr/local/ispconfig/server/server.sh &> /dev/null',
+			'30 00 * * * /usr/local/ispconfig/server/cron_daily.sh &> /dev/null'
+		);
 		foreach($root_cron_jobs as $cron_job) {
 			if(!in_array($cron_job."\n", $existing_root_cron_jobs)) {
 				$existing_root_cron_jobs[] = $cron_job."\n";

interface/web/mail/spamfilter_blacklist_edit.php

@@ -63,7 +63,7 @@ function onShowNew() {
 			$client = $app->db->queryOneRecord("SELECT limit_spamfilter_wblist FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
 
 			// Check if the user may add another mailbox.
-			if($client["limit_limit_spamfilter_wblist"] >= 0) {
+			if($client["limit_spamfilter_wblist"] >= 0) {
 				$tmp = $app->db->queryOneRecord("SELECT count(wblist_id) as number FROM spamfilter_wblist WHERE sys_groupid = $client_group_id");
 				if($tmp["number"] >= $client["limit_spamfilter_wblist"]) {
 					$app->error($app->tform->wordbook["limit_spamfilter_wblist_txt"]);

interface/web/mail/spamfilter_whitelist_edit.php

@@ -63,7 +63,7 @@ function onShowNew() {
 			$client = $app->db->queryOneRecord("SELECT limit_spamfilter_wblist FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
 
 			// Check if the user may add another mailbox.
-			if($client["limit_limit_spamfilter_wblist"] >= 0) {
+			if($client["limit_spamfilter_wblist"] >= 0) {
 				$tmp = $app->db->queryOneRecord("SELECT count(wblist_id) as number FROM spamfilter_wblist WHERE sys_groupid = $client_group_id");
 				if($tmp["number"] >= $client["limit_spamfilter_wblist"]) {
 					$app->error($app->tform->wordbook["limit_spamfilter_wblist_txt"]);

interface/web/sites/templates/web_domain_ssl.htm

@@ -21,15 +21,15 @@
   </tr>
   <tr>
     <td class="frmText11">{tmpl_var name='ssl_request_txt'}:</td>
-    <td class="frmText11"><textarea name='ssl_request' cols='30' rows='10'>{tmpl_var name='ssl_request'}</textarea></td>
+    <td class="frmText11"><textarea name='ssl_request' cols='50' rows='10'>{tmpl_var name='ssl_request'}</textarea></td>
   </tr>
   <tr>
     <td class="frmText11">{tmpl_var name='ssl_cert_txt'}:</td>
-    <td class="frmText11"><textarea name='ssl_cert' cols='30' rows='10'>{tmpl_var name='ssl_cert'}</textarea></td>
+    <td class="frmText11"><textarea name='ssl_cert' cols='50' rows='10'>{tmpl_var name='ssl_cert'}</textarea></td>
   </tr>
   <tr>
     <td class="frmText11">{tmpl_var name='ssl_bundle_txt'}:</td>
-    <td class="frmText11"><textarea name='ssl_bundle' cols='30' rows='10'>{tmpl_var name='ssl_bundle'}</textarea></td>
+    <td class="frmText11"><textarea name='ssl_bundle' cols='50' rows='10'>{tmpl_var name='ssl_bundle'}</textarea></td>
   </tr>
   <tr>
     <td class="frmText11">{tmpl_var name='ssl_action_txt'}:</td>

server/conf/vhost.conf.master

@@ -81,10 +81,10 @@
 	ErrorDocument 503 /error/overloaded.html
 
 	SSLEngine on
-	SSLCertificateFile <tmpl_var name='document_root'>/<tmpl_var name='domain'>.crt
-	SSLCertificateKeyFile <tmpl_var name='document_root'>/<tmpl_var name='domain'>.key
+	SSLCertificateFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='domain'>.crt
+	SSLCertificateKeyFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='domain'>.key
 <tmpl_if name='has_bundle_cert'>
-	SSLCACertificateFile <tmpl_var name='document_root'>/<tmpl_var name='domain'>.bundle
+	SSLCACertificateFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='domain'>.bundle
 </tmpl_if>
 
 <tmpl_if name='alias'>

server/cron_daily.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin
+
+/usr/bin/php -q /usr/local/ispconfig/server/cron_daily.php

server/plugins-enabled/apache2_plugin.inc.php

@@ -235,9 +235,12 @@ function update($event_name,$data) {
 		}
 
 		// Copy the error pages
-		$error_page_path = escapeshellcmd($data["new"]["web_document_root"])."/web/error/";
+		$error_page_path = escapeshellcmd($data["new"]["document_root"])."/web/error/";
 		exec("cp /usr/local/ispconfig/server/conf/error/".substr(escapeshellcmd($conf["language"]),0,2)."/* ".$error_page_path);
 
+		// copy the standard index page
+		exec("cp /usr/local/ispconfig/server/conf/index/standard_index.html_".substr(escapeshellcmd($conf["language"]),0,2)." ".escapeshellcmd($data["new"]["document_root"])."/web/");
+		
 		// Create group and user, if not exist
 		$app->uses("system");