From ecabf6fec411ebc75f6483022b83534fbff8803b Mon Sep 17 00:00:00 2001 From: tbrehm Date: Wed, 7 Sep 2011 10:25:34 +0000 Subject: [PATCH] Removed unsupported setting in vhost config file and added german translation of welcome email message. --- server/conf/mail/welcome_email_de.txt | 4 ++++ server/conf/vhost.conf.master | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 server/conf/mail/welcome_email_de.txt diff --git a/server/conf/mail/welcome_email_de.txt b/server/conf/mail/welcome_email_de.txt new file mode 100644 index 0000000000..6898591fb9 --- /dev/null +++ b/server/conf/mail/welcome_email_de.txt @@ -0,0 +1,4 @@ +From: ISPConfig +Subject: Ihr Mailaccount ist aktiv. + +Ihr Mailaccount ist jetzt aktiv. Viel Vergnügen. \ No newline at end of file diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master index a324ca4a53..227b4b8660 100644 --- a/server/conf/vhost.conf.master +++ b/server/conf/vhost.conf.master @@ -371,7 +371,7 @@ IdleTimeout 300 ProcessLifeTime 3600 - MaxProcessCount 1000 + # MaxProcessCount 1000 DefaultMinClassProcessCount 0 DefaultMaxClassProcessCount 100 IPCConnectTimeout 3 -- GitLab