From 615a0a96618fa99e7e452523145d6c0f238d4473 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 31 Jul 2013 09:33:43 -0400
Subject: [PATCH] Merged revisions 3960-4065 from stable branch.

---
 install/tpl/server.ini.master |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master
index 007d51b..d22a072 100644
--- a/install/tpl/server.ini.master
+++ b/install/tpl/server.ini.master
@@ -14,8 +14,15 @@
 nameservers=8.8.8.8,8.8.4.4
 firewall=bastille
 loglevel=2
+admin_notify_events=1
 backup_dir=/var/backup
 backup_mode=rootgz
+monit_url=
+monit_user=
+monit_password=
+munin_url=
+munin_user=
+munin_password=
 
 [mail]
 module=postfix_mysql
@@ -35,6 +42,10 @@
 message_size_limit=0
 mailbox_quota_stats=y
 realtime_blackhole_list=
+overquota_notify_admin=y
+overquota_notify_client=y
+overquota_notify_freq=7
+overquota_notify_onok=n
 sendmail_path=/usr/sbin/sendmail
 
 [getmail]
@@ -58,7 +69,7 @@
 apps_vhost_port=8081
 apps_vhost_ip=_default_
 apps_vhost_servername=
-php_open_basedir=[website_path]/web:[website_path]/private:[website_path]/tmp:/var/www/[website_domain]/web:/srv/www/[website_domain]/web:/usr/share/php5:/usr/share/php:/tmp:/usr/share/phpmyadmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/usr/share/php
+php_open_basedir=[website_path]/web:[website_path]/private:[website_path]/tmp:/var/www/[website_domain]/web:/srv/www/[website_domain]/web:/usr/share/php5:/usr/share/php:/tmp:/usr/share/phpmyadmin:/etc/phpmyadmin:/var/lib/phpmyadmin
 htaccess_allow_override=All
 awstats_conf_dir=/etc/awstats
 awstats_data_dir=/var/lib/awstats
@@ -82,8 +93,12 @@
 connect_userid_to_webid=n
 connect_userid_to_webid_start=10000
 web_folder_protection=y
-php_ini_check_minutes=1
-
+<<<<<<< .minephp_ini_check_minutes=1
+=======overquota_notify_admin=y
+overquota_notify_client=y
+overquota_notify_freq=7
+overquota_notify_onok=n
+>>>>>>> .theirs
 [dns]
 bind_user=root
 bind_group=bind

--
Gitblit v1.9.1