massive update of the wheezy templates, but take them with a grain of salt for now, in particular:

- dkim is broken (pending code changes, this affects *everyone* with opendkim i suppose)
- it has received *no* testing (yet)

other noteworthy stuff:
- nginx should be switched to upstream provided fcgi params file, as its essentially the same.
- dovecot should now work with exim4
- for the most part, configs were switched to the commented version if available, that requires some more reading for the admins, but this isn't a problem for you... right? :)

while i don't think any of this will break horribly, like drinking the beer in your fridge or some other nasty stuff, it will still require testing

Signed-off-by: Robert Förster (Dessa) <Dessa@froxlor.org>

templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_default_pure-ftpd-common

@@ -1,5 +1,26 @@
+# Configuration for pure-ftpd
+# (this file is sourced by /bin/sh, edit accordingly)
+
+# STANDALONE_OR_INETD
+# valid values are "standalone" and "inetd".
+# Any change here overrides the setting in debconf.
 STANDALONE_OR_INETD=standalone
+
+# VIRTUALCHROOT: 
+# whether to use binary with virtualchroot support
+# valid values are "true" or "false"
+# Any change here overrides the setting in debconf.
 VIRTUALCHROOT=false
+
+# UPLOADSCRIPT: if this is set and the daemon is run in standalone mode,
+# pure-uploadscript will also be run to spawn the program given below
+# for handling uploads. see /usr/share/doc/pure-ftpd/README.gz or
+# pure-uploadscript(8)
+
+# example: UPLOADSCRIPT=/usr/local/sbin/uploadhandler.pl
 UPLOADSCRIPT=
+
+# if set, pure-uploadscript will spawn  running as the
+# given uid and gid
 UPLOADUID=
 UPLOADGID=

templates/misc/configfiles/debian_wheezy/pure-ftpd/etc_pure-ftpd_db_mysql.conf

@@ -1,11 +1,129 @@
-MYSQLServer	<SQL_HOST>
+
+##############################################
+#                                            #
+# Sample Pure-FTPd Mysql configuration file. #
+# See README.MySQL for explanations.         #
+#                                            #
+##############################################
+
+
+# Optional : MySQL server name or IP. Don't define this for unix sockets.
+
+# MYSQLServer     <SQL_HOST>
+
+
+# Optional : MySQL port. Don't define this if a local unix socket is used.
+
+# MYSQLPort       3306
+
+
+# Optional : define the location of mysql.sock if the server runs on this host.
+
+MYSQLSocket      /var/run/mysqld/mysqld.sock
+
+
+# Mandatory : user to bind the server as.
+
 MYSQLUser       <SQL_UNPRIVILEGED_USER>
+
+
+# Mandatory : user password. You must have a password.
+
 MYSQLPassword   <SQL_UNPRIVILEGED_PASSWORD>
+
+
+# Mandatory : database to open.
+
 MYSQLDatabase   <SQL_DB>
+
+
+# Mandatory : how passwords are stored
+# Valid values are : "cleartext", "crypt", "sha1", "md5" and "password"
+# ("password" = MySQL password() function)
+# You can also use "any" to try "crypt", "sha1", "md5" *and* "password"
+
 MYSQLCrypt      any
 
+
+# In the following directives, parts of the strings are replaced at
+# run-time before performing queries :
+#
+# \L is replaced by the login of the user trying to authenticate.
+# \I is replaced by the IP address the user connected to.
+# \P is replaced by the port number the user connected to.
+# \R is replaced by the IP address the user connected from.
+# \D is replaced by the remote IP address, as a long decimal number.
+#
+# Very complex queries can be performed using these substitution strings,
+# especially for virtual hosting.
+
+
+# Query to execute in order to fetch the password
+
 MYSQLGetPW      SELECT password FROM ftp_users WHERE username="\L" AND login_enabled="y"
+
+
+# Query to execute in order to fetch the system user name or uid
+
 MYSQLGetUID     SELECT uid FROM ftp_users WHERE username="\L" AND login_enabled="y"
+
+
+# Optional : default UID - if set this overrides MYSQLGetUID
+
+#MYSQLDefaultUID 1000
+
+
+# Query to execute in order to fetch the system user group or gid
+
 MYSQLGetGID     SELECT gid FROM ftp_users WHERE username="\L" AND login_enabled="y"
+
+
+# Optional : default GID - if set this overrides MYSQLGetGID
+
+#MYSQLDefaultGID 1000
+
+
+# Query to execute in order to fetch the home directory
+
 MYSQLGetDir     SELECT homedir FROM ftp_users WHERE username="\L" AND login_enabled="y"
-MySQLGetQTASZ 	SELECT panel_customers.diskspace/1024 AS QuotaSize FROM panel_customers, ftp_users WHERE username = "\L" AND panel_customers.loginname = SUBSTRING_INDEX('\L', 'ftp', 1)
+
+
+# Optional : query to get the maximal number of files 
+# Pure-FTPd must have been compiled with virtual quotas support.
+
+# MySQLGetQTAFS  SELECT QuotaFiles FROM users WHERE User='\L'
+
+
+# Optional : query to get the maximal disk usage (virtual quotas)
+# The number should be in Megabytes.
+# Pure-FTPd must have been compiled with virtual quotas support.
+
+MySQLGetQTASZ  SELECT panel_customers.diskspace/1024 AS QuotaSize FROM panel_customers, ftp_users WHERE username = "\L" AND panel_customers.loginname = SUBSTRING_INDEX('\L', 'ftp', 1)
+
+
+# Optional : ratios. The server has to be compiled with ratio support.
+
+# MySQLGetRatioUL SELECT ULRatio FROM users WHERE User='\L'
+# MySQLGetRatioDL SELECT DLRatio FROM users WHERE User='\L'
+
+
+# Optional : bandwidth throttling.
+# The server has to be compiled with throttling support.
+# Values are in KB/s .
+
+# MySQLGetBandwidthUL SELECT ULBandwidth FROM users WHERE User='\L'
+# MySQLGetBandwidthDL SELECT DLBandwidth FROM users WHERE User='\L'
+
+# Enable ~ expansion. NEVER ENABLE THIS BLINDLY UNLESS :
+# 1) You know what you are doing.
+# 2) Real and virtual users match.
+
+# MySQLForceTildeExpansion 1
+
+
+# If you're using a transactionnal storage engine, you can enable SQL
+# transactions to avoid races. Leave this commented if you are using the
+# traditionnal MyIsam engine.
+
+# MySQLTransactions On
+