diff --git a/INSTALL_DEBIAN.txt b/INSTALL_DEBIAN.txt index d08a87da27c9914881bc4e204efc5cdbde46c013..e4dcc855b55d99c312e1ab4044b0912cbe7fe098 100644 --- a/INSTALL_DEBIAN.txt +++ b/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 diff --git a/INSTALL_UBUNTU.txt b/INSTALL_UBUNTU.txt index 765a3deb73cc155468a1e43c4b9e353a225cb99c..916396ba92d96d28331c3ca5efd879ff490112e1 100644 --- a/INSTALL_UBUNTU.txt +++ b/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 diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 22d8ab41b606b43093fe91f6a8dedcf087c5995e..fab527743017e1d977a6e6ee5589a1663fa8bdd2 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -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"; diff --git a/interface/web/mail/spamfilter_blacklist_edit.php b/interface/web/mail/spamfilter_blacklist_edit.php index e4772da21d7e84f285b3290be5a7a4087be39bf8..729c23ebd97c7762363713c015508f5bbd101fe6 100644 --- a/interface/web/mail/spamfilter_blacklist_edit.php +++ b/interface/web/mail/spamfilter_blacklist_edit.php @@ -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"]); diff --git a/interface/web/mail/spamfilter_whitelist_edit.php b/interface/web/mail/spamfilter_whitelist_edit.php index fb2a5ef692aea56763325af8fb7e36a58eb292f4..3630986afaf904d8647e1e9d8990455da10438dd 100644 --- a/interface/web/mail/spamfilter_whitelist_edit.php +++ b/interface/web/mail/spamfilter_whitelist_edit.php @@ -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"]); diff --git a/interface/web/sites/templates/web_domain_ssl.htm b/interface/web/sites/templates/web_domain_ssl.htm index c3f2b454aff5b6d1348fb8c973683936cfcf2343..f43101b21d9e80cbb3db544366cf0f2f155ae74e 100644 --- a/interface/web/sites/templates/web_domain_ssl.htm +++ b/interface/web/sites/templates/web_domain_ssl.htm @@ -21,15 +21,15 @@ {tmpl_var name='ssl_request_txt'}: - + {tmpl_var name='ssl_cert_txt'}: - + {tmpl_var name='ssl_bundle_txt'}: - + {tmpl_var name='ssl_action_txt'}: diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master index d5199de788becc7aaa40d1b5d6bf7cc8c13e0c59..afd65baee889b2052cc2c4c290bc5d652d37f2fa 100644 --- a/server/conf/vhost.conf.master +++ b/server/conf/vhost.conf.master @@ -81,10 +81,10 @@ ErrorDocument 503 /error/overloaded.html SSLEngine on - SSLCertificateFile /.crt - SSLCertificateKeyFile /.key + SSLCertificateFile /ssl/.crt + SSLCertificateKeyFile /ssl/.key - SSLCACertificateFile /.bundle + SSLCACertificateFile /ssl/.bundle diff --git a/server/cron_daily.sh b/server/cron_daily.sh new file mode 100644 index 0000000000000000000000000000000000000000..77a0a2febebf5a04171493964c9f9f86c0b16b27 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/server/plugins-enabled/apache2_plugin.inc.php b/server/plugins-enabled/apache2_plugin.inc.php index a167014734aa35e2a6d5ce958f081cc601b99340..41342bb1fb8e936cc0b5ec7a23fa9dbc47d74ecf 100644 --- a/server/plugins-enabled/apache2_plugin.inc.php +++ b/server/plugins-enabled/apache2_plugin.inc.php @@ -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");