Commit 30aa0891 authored by tbrehm's avatar tbrehm

- 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.
parent ba66cdbf
......@@ -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
......
......@@ -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
......
......@@ -648,7 +648,10 @@ class installer_base {
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";
......
......@@ -63,7 +63,7 @@ class page_action extends tform_actions {
$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"]);
......
......@@ -63,7 +63,7 @@ class page_action extends tform_actions {
$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"]);
......
......@@ -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>
......
......@@ -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'>
......
#!/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
\ No newline at end of file
......@@ -235,9 +235,12 @@ class apache2_plugin {
}
// 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");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment