summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteffen Hansen <steffen@kdab.com>2005-06-10 12:25:23 (GMT)
committerSteffen Hansen <steffen@kdab.com>2005-06-10 12:25:23 (GMT)
commitbdf0e10ffc6c947f42ce38d7a45e72f79e4b924c (patch)
treea7155293ffb6c5cd568cf49d93ddf885c90fd43e
parent77b574198c217b92b8357b73c06d4deee7e221be (diff)
downloadkolab-conf-bdf0e10ffc6c947f42ce38d7a45e72f79e4b924c.tar.gz
upped php max exec time (issue793), added recipient check to postfix to keep crap out of the local queue
-rw-r--r--conf/templates/main.cf.template13
-rw-r--r--conf/templates/master.cf.template1
-rw-r--r--conf/templates/php.ini.template2
3 files changed, 12 insertions, 4 deletions
diff --git a/conf/templates/main.cf.template b/conf/templates/main.cf.template
index ad80252..c9e77c9 100644
--- a/conf/templates/main.cf.template
+++ b/conf/templates/main.cf.template
@@ -53,12 +53,14 @@ relocated_maps = hash:@l_prefix@/etc/postfix/relocated
transport_maps = hash:@l_prefix@/etc/postfix/transport, ldap:ldaptransport
alias_maps = hash:@l_prefix@/etc/postfix/aliases
alias_database = hash:@l_prefix@/etc/postfix/aliases
-local_recipient_maps =
+virtual_mailbox_maps = $virtual_maps
+local_recipient_maps = $virtual_mailbox_maps
# local delivery
recipient_delimiter = +
#mailbox_transport = lmtp:unix:@l_prefix@/var/kolab/lmtp
mailbox_transport = kolabmailboxfilter
+local_transport = virtual
#TLS settings
smtpd_use_tls = yes
@@ -112,7 +114,7 @@ tls_random_source = dev:/dev/urandom
## Kolab Policy Server
smtpd_recipient_restrictions = permit_mynetworks,permit_sasl_authenticated,
- reject_unauth_destination, check_policy_service unix:private/kolabpolicy
+ reject_unauth_destination, reject_unlisted_recipient, check_policy_service unix:private/kolabpolicy
smtpd_sender_restrictions = permit_mynetworks, check_policy_service unix:private/kolabpolicy
kolabpolicy_time_limit = 3600
kolabpolicy_max_idle = 20
@@ -135,7 +137,7 @@ broken_sasl_auth_clients = yes
ldapvirtual_server_host = @@@ldap_uri@@@
ldapvirtual_search_base = @@@user_dn_list@@@
-ldapvirtual_query_filter = (alias=%s)
+ldapvirtual_query_filter = (|(alias=%s)(mail=%s))
ldapvirtual_result_attribute = mail
ldapvirtual_result_filter = %s
ldapvirtual_search_timeout = 15
@@ -146,6 +148,11 @@ ldapvirtual_bind_pw = @@@php_pw@@@
ldapvirtual_version = 3
#
+# LDAP Recipient map
+#
+
+
+#
# LDAP Distributionlist support
#
diff --git a/conf/templates/master.cf.template b/conf/templates/master.cf.template
index 9624da9..e8109b3 100644
--- a/conf/templates/master.cf.template
+++ b/conf/templates/master.cf.template
@@ -18,6 +18,7 @@ qmgr fifo n - n 300 1 qmgr
rewrite unix - - n - - trivial-rewrite
bounce unix - - n - 0 bounce
defer unix - - n - 0 bounce
+verify unix - - n - 1 verify
flush unix n - n 1000? 0 flush
smtp unix - - n - - smtp
showq unix n - n - - showq
diff --git a/conf/templates/php.ini.template b/conf/templates/php.ini.template
index c7254f4..69eb089 100644
--- a/conf/templates/php.ini.template
+++ b/conf/templates/php.ini.template
@@ -208,7 +208,7 @@ expose_php = On
; Resource Limits ;
;;;;;;;;;;;;;;;;;;;
-max_execution_time = 30 ; Maximum execution time of each script, in seconds
+max_execution_time = 600 ; Maximum execution time of each script, in seconds
memory_limit = 8M ; Maximum amount of memory a script may consume (8MB)