From 90ea8cfc1bd5aaee8f26c775dfe87c57aad6b7a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20F=C3=B6rster=20=28Dessa=29?= <Dessa@froxlor.org>
Date: Sat, 4 May 2013 10:03:11 +0200
Subject: [PATCH] phase out hardy and dovecot1 configs for gentoo

---
 lib/configfiles/gentoo.inc.php                |  24 +-
 lib/configfiles/hardy.inc.php                 | 399 ------------------
 lib/configfiles_index.inc.php                 |   2 +-
 .../dovecot/etc_dovecot_dovecot-sql.conf      |   1 +
 .../gentoo/dovecot/etc_dovecot_dovecot.conf   | 109 +++--
 .../dovecot2/etc_dovecot_dovecot-sql.conf     |   6 -
 .../gentoo/dovecot2/etc_dovecot_dovecot.conf  |  65 ---
 .../etc_apache2_mods-enabled_fastcgi.conf     |  11 -
 .../courier/etc_courier_authdaemonrc          |  68 ---
 .../courier/etc_courier_authmysqlrc           |  14 -
 .../ubuntu_hardy/cron/etc_cron.d_froxlor      |   8 -
 .../ubuntu_hardy/dkim/dkim-filter.conf        |  11 -
 .../dovecot/etc_dovecot_dovecot-sql.conf      |   5 -
 .../dovecot/etc_dovecot_dovecot.conf          |  71 ----
 ..._conf.d_acl_30_exim4-config_check_rcpt.rul | 125 ------
 .../etc_exim4_conf.d_auth_30_froxlor-config   |  30 --
 ...xim4_conf.d_main_10_froxlor-config_options |  20 -
 ...etc_exim4_conf.d_router_180_froxlor-config |  13 -
 ...c_exim4_conf.d_transport_30_froxlor-config |  13 -
 .../libnss/etc_nss-mysql-root.conf            |  16 -
 .../ubuntu_hardy/libnss/etc_nss-mysql.conf    |  24 --
 .../ubuntu_hardy/libnss/etc_nsswitch.conf     |  20 -
 .../ubuntu_hardy/lighttpd/etc_lighttpd.conf   |  57 ---
 .../ubuntu_hardy/nginx/etc_init.d_php-fcgi    |  41 --
 .../ubuntu_hardy/nginx/etc_nginx_fastcgi.conf |  15 -
 .../ubuntu_hardy/nginx/etc_nginx_nginx.conf   |  26 --
 .../postfix_courier/etc_postfix_main.cf       |  80 ----
 .../etc_postfix_mysql-virtual_alias_maps.cf   |   8 -
 ...c_postfix_mysql-virtual_mailbox_domains.cf |   8 -
 .../etc_postfix_mysql-virtual_mailbox_maps.cf |   7 -
 ...ostfix_mysql-virtual_sender_permissions.cf |   5 -
 .../etc_postfix_sasl_smtpd.conf               |  11 -
 .../postfix_dovecot/etc_postfix_main.cf       |  86 ----
 .../postfix_dovecot/etc_postfix_master.cf     |   4 -
 .../etc_postfix_mysql-virtual_alias_maps.cf   |   8 -
 ...c_postfix_mysql-virtual_mailbox_domains.cf |   8 -
 .../etc_postfix_mysql-virtual_mailbox_maps.cf |   7 -
 ...ostfix_mysql-virtual_sender_permissions.cf |   5 -
 .../postfix_mxaccess/etc_postfix_main.cf      |  25 --
 .../postfix_mxaccess/etc_postfix_mx_access    |   9 -
 .../powerdns/etc_powerdns_pdns-froxlor.conf   |   7 -
 .../powerdns/etc_powerdns_pdns.conf           |  17 -
 .../proftpd/etc_proftpd_modules.conf          |  34 --
 .../proftpd/etc_proftpd_proftpd.conf          |  79 ----
 .../pure-ftpd/etc_default_pure-ftpd-common    |   5 -
 .../pure-ftpd/etc_pure-ftpd_conf_Bind         |   1 -
 .../etc_pure-ftpd_conf_ChrootEveryone         |   1 -
 .../etc_pure-ftpd_conf_CustomerProof          |   1 -
 .../pure-ftpd/etc_pure-ftpd_conf_MaxIdleTime  |   1 -
 .../pure-ftpd/etc_pure-ftpd_conf_MinUID       |   1 -
 .../etc_pure-ftpd_conf_MySQLConfigFile        |   1 -
 .../pure-ftpd/etc_pure-ftpd_conf_NoAnonymous  |   1 -
 .../etc_pure-ftpd_conf_PAMAuthentication      |   1 -
 .../pure-ftpd/etc_pure-ftpd_db_mysql.conf     |  11 -
 54 files changed, 54 insertions(+), 1572 deletions(-)
 delete mode 100644 lib/configfiles/hardy.inc.php
 delete mode 100644 templates/misc/configfiles/gentoo/dovecot2/etc_dovecot_dovecot-sql.conf
 delete mode 100644 templates/misc/configfiles/gentoo/dovecot2/etc_dovecot_dovecot.conf
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/apache2/etc_apache2_mods-enabled_fastcgi.conf
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/courier/etc_courier_authdaemonrc
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/courier/etc_courier_authmysqlrc
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/cron/etc_cron.d_froxlor
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/dkim/dkim-filter.conf
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/dovecot/etc_dovecot_dovecot-sql.conf
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/dovecot/etc_dovecot_dovecot.conf
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/exim4/etc_exim4_conf.d_acl_30_exim4-config_check_rcpt.rul
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/exim4/etc_exim4_conf.d_auth_30_froxlor-config
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/exim4/etc_exim4_conf.d_main_10_froxlor-config_options
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/exim4/etc_exim4_conf.d_router_180_froxlor-config
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/exim4/etc_exim4_conf.d_transport_30_froxlor-config
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/libnss/etc_nss-mysql-root.conf
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/libnss/etc_nss-mysql.conf
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/libnss/etc_nsswitch.conf
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/lighttpd/etc_lighttpd.conf
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/nginx/etc_init.d_php-fcgi
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/nginx/etc_nginx_fastcgi.conf
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/nginx/etc_nginx_nginx.conf
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_main.cf
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_sasl_smtpd.conf
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_main.cf
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_master.cf
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/postfix_mxaccess/etc_postfix_main.cf
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/postfix_mxaccess/etc_postfix_mx_access
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/powerdns/etc_powerdns_pdns-froxlor.conf
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/powerdns/etc_powerdns_pdns.conf
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/proftpd/etc_proftpd_modules.conf
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/proftpd/etc_proftpd_proftpd.conf
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_default_pure-ftpd-common
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_conf_Bind
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_conf_ChrootEveryone
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_conf_CustomerProof
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_conf_MaxIdleTime
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_conf_MinUID
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_conf_MySQLConfigFile
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_conf_NoAnonymous
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_conf_PAMAuthentication
 delete mode 100644 templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_db_mysql.conf

diff --git a/lib/configfiles/gentoo.inc.php b/lib/configfiles/gentoo.inc.php
index 74337098..e22108e9 100644
--- a/lib/configfiles/gentoo.inc.php
+++ b/lib/configfiles/gentoo.inc.php
@@ -301,29 +301,7 @@ milter_default_action = accept" >> /etc/postfix/main.cf',
 						)
 					),
 					'dovecot' => Array(
-						'label' => 'Dovecot 1 *deprecated*',
-						'commands_1' => Array(
-							'echo "net-mail/dovecot mysql" >> /etc/portage/package.use',
-							'emerge -av dovecot',
-							'mv /etc/dovecot/dovecot.conf /etc/dovecot/dovecot.conf.gentoo',
-							'mv /etc/dovecot/dovecot-sql.conf /etc/dovecot/dovecot-sql.conf.gentoo',
-							'touch /etc/dovecot/dovecot.conf',
-							'touch /etc/dovecot/dovecot-sql.conf',
-						),
-						'files' => Array(
-							'etc_dovecot_dovecot.conf' => '/etc/dovecot/dovecot.conf',
-							'etc_dovecot_dovecot-sql.conf' => '/etc/dovecot/dovecot-sql.conf'
-						),
-						'commands_2' => Array(
-							'chmod 0640 /etc/dovecot/dovecot-sql.conf',
-							'rc-update add dovecot default'
-						),
-						'restart' => Array(
-							'/etc/init.d/dovecot restart'
-						)
-					),
-					'dovecot2' => Array(
-						'label' => 'Dovecot 2',
+						'label' => 'Dovecot',
 						'commands_1' => Array(
 							'echo "net-mail/dovecot mysql" >> /etc/portage/package.use',
 							'emerge -av dovecot',
diff --git a/lib/configfiles/hardy.inc.php b/lib/configfiles/hardy.inc.php
deleted file mode 100644
index a7158bed..00000000
--- a/lib/configfiles/hardy.inc.php
+++ /dev/null
@@ -1,399 +0,0 @@
-<?php
-
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2003-2009 the SysCP Team (see authors).
- * Copyright (c) 2010 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright  (c) the authors
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
- * @author     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Configfiles
- *
- */
-
-// Try to guess user/group from settings' email UID/GID
-$vmail_user=posix_getpwuid($settings['system']['vmail_uid']);
-$vmail_group=posix_getgrgid($settings['system']['vmail_gid']);
-
-/* If one of them are not set, call it 'vmail' and suggest creating user/group
- * in scripts. */
-if ($vmail_user === false) {
-	$vmail_username="vmail";
-} else {
-	$vmail_username=$vmail_user['name'];
-}
-if ($vmail_group === false) {
-	$vmail_groupname="vmail";
-} else {
-	$vmail_groupname=$vmail_group['name'];
-}
-
-return Array(
-	'ubuntu_hardy' => Array(
-		'label' => 'Ubuntu 8.04 (Hardy) *deprecated*',
-		'services' => Array(
-			'http' => Array(
-				'label' => $lng['admin']['configfiles']['http'],
-				'daemons' => Array(
-					'apache2' => Array(
-						'label' => 'Apache 2',
-						'commands' => Array(
-							'mkdir -p ' . $settings['system']['documentroot_prefix'],
-							'mkdir -p ' . $settings['system']['logfiles_directory'],
-							($settings['system']['deactivateddocroot'] != '') ? 'mkdir -p ' . $settings['system']['deactivateddocroot'] : '',
-							'mkdir -p ' . $settings['system']['mod_fcgid_tmpdir'],
-							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir'],
-							'a2dismod userdir'
-						),
-						'files' => ((int)$settings['phpfpm']['enabled'] == 1) ?
-							Array(
-								'etc_apache2_mods-enabled_fastcgi.conf' => '/etc/apache2/mods-enabled/fastcgi.conf'
-							)
-							:
-							null,
-						'restart' => Array(
-							'/etc/init.d/apache2 restart'
-						)
-					),
-					'lighttpd' => Array(
-						'label' => 'Lighttpd Webserver',
-						'commands_1' => Array(
-							'apt-get install lighttpd',
-						),
-						'files' => Array(
-							'etc_lighttpd.conf' => '/etc/lighttpd/lighttpd.conf',
-						),
-						'commands_2' => Array(
-							$configcommand['vhost'],
-							$configcommand['diroptions'],
-							$configcommand['v_inclighty'],
-							$configcommand['d_inclighty'],
-							'lighty-disable-mod cgi',
-							'lighty-disable-mod fastcgi',
-							'mkdir -p ' . $settings['system']['documentroot_prefix'],
-							'mkdir -p ' . $settings['system']['logfiles_directory'],
-							($settings['system']['deactivateddocroot'] != '') ? 'mkdir -p ' . $settings['system']['deactivateddocroot'] : '',
-							'mkdir -p ' . $settings['system']['mod_fcgid_tmpdir'],
-							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir']
-						),
-						'restart' => Array(
-							'/etc/init.d/lighttpd restart'
-						)
-					),
-					'nginx' => Array(
-						'label' => 'Nginx Webserver',
-						'commands_1' => Array(
-							'apt-get install nginx php5-cgi',
-						),
-						'files' => Array(
-							'etc_nginx_nginx.conf' => '/etc/nginx/nginx.conf',
-							'etc_init.d_php-fcgi' => '/etc/init.d/php-fcgi'
-						),
-						'commands_2' => Array(
-							'rm /etc/nginx/sites-enabled/default',
-							'mkdir -p ' . $settings['system']['documentroot_prefix'],
-							'mkdir -p ' . $settings['system']['logfiles_directory'],
-							//'mkdir -p ' . $settings['system']['deactivateddocroot'],
-							'mkdir -p ' . $settings['system']['mod_fcgid_tmpdir'],
-							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir'],
-							'chmod u+x /etc/init.d/php-fcgi'
-						),
-						'restart' => Array(
-							'/etc/init.d/php-fcgi start',
-							'/etc/init.d/nginx restart'
-						)
-					)
-				)
-			),
-			'dns' => Array(
-				'label' => $lng['admin']['configfiles']['dns'],
-				'daemons' => Array(
-					'bind' => Array(
-						'label' => 'Bind9',
-						'commands' => Array(
-							'echo "include \"' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf\";" >> /etc/bind/named.conf',
-							'touch ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf',
-							'chown root:bind ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf',
-							'chmod 0644 ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf'
-						),
-						'restart' => Array(
-							'/etc/init.d/bind9 restart'
-						)
-					),
-					'powerdns' => Array(
-						'label' => 'PowerDNS',
-						'files' => Array(
-							'etc_powerdns_pdns.conf' => '/etc/powerdns/pdns.conf',
-							'etc_powerdns_pdns-froxlor.conf' => '/etc/powerdns/pdns_froxlor.conf',
-						),
-						'restart' => Array(
-							'/etc/init.d/pdns restart'
-						)
-					),
-				)
-			),
-			'smtp' => Array(
-				'label' => $lng['admin']['configfiles']['smtp'],
-				'daemons' => Array(
-					'postfix_courier' => Array(
-						'label' => 'Postfix/Courier',
-						'commands' => Array(
-							($vmail_group === false) ? 'groupadd -g ' . $settings['system']['vmail_gid'] . ' ' . $vmail_groupname : '',
-							($vmail_user === false) ? 'useradd -u ' . $settings['system']['vmail_uid'] . ' -g ' . $vmail_groupname . ' ' . $vmail_username : '',
-							'mkdir -p ' . $settings['system']['vmail_homedir'],
-							'chown -R '.$vmail_username.':'.$vmail_groupname.' ' . $settings['system']['vmail_homedir'],
-							'apt-get install postfix postfix-mysql libsasl2-2 libsasl2-modules libsasl2-modules-sql',
-							'mkdir -p /var/spool/postfix/etc/pam.d',
-							'mkdir -p /var/spool/postfix/var/run/mysqld',
-							'touch /etc/postfix/mysql-virtual_alias_maps.cf',
-							'touch /etc/postfix/mysql-virtual_mailbox_domains.cf',
-							'touch /etc/postfix/mysql-virtual_mailbox_maps.cf',
-							'touch /etc/postfix/mysql-virtual_sender_permissions.cf',
-							'touch /etc/postfix/sasl/smtpd.conf',
-							'chown root:root /etc/postfix/main.cf',
-							'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf',
-							'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf',
-							'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf',
-							'chown root:postfix /etc/postfix/mysql-virtual_sender_permissions.cf',
-							'chown root:root /etc/postfix/sasl/smtpd.conf',
-							'chmod 0644 /etc/postfix/main.cf',
-							'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf',
-							'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf',
-							'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf',
-							'chmod 0640 /etc/postfix/mysql-virtual_sender_permissions.cf',
-							'chmod 0600 /etc/postfix/sasl/smtpd.conf',
-						),
-						'files' => Array(
-							'etc_postfix_main.cf' => '/etc/postfix/main.cf',
-							'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf',
-							'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf',
-							'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf',
-							'etc_postfix_mysql-virtual_sender_permissions.cf' => '/etc/postfix/mysql-virtual_sender_permissions.cf',
-							'etc_postfix_sasl_smtpd.conf' => '/etc/postfix/sasl/smtpd.conf'
-						),
-						'restart' => Array(
-							'newaliases',
-							'/etc/init.d/postfix restart'
-						)
-					),
-					'dkim' => Array(
-						'label' => 'DomainKey filter',
-						'commands_1' => Array(
-							'apt-get install dkim-filter',
-							'mkdir -p /etc/postfix/dkim'
-						),
-						'files' => Array(
-							'dkim-filter.conf' => '/etc/dkim-filter.conf'
-						),
-						'commands_2' => Array(
-							'echo "milter_default_action = accept" >> /etc/postfix/main.cf',
-							'echo "milter_protocol = 2" >> /etc/postfix/main.cf',
-							'echo "smtpd_milters = inet:localhost:8891" >> /etc/postfix/main.cf',
-							'echo "non_smtpd_milters = inet:localhost:8891" >> /etc/postfix/main.cf'
-						),
-						'restart' => Array(
-							'/etc/init.d/dkim-filter restart',
-							'/etc/init.d/postfix restart'
-						)
-					),
-					'postfix_dovecot' => Array(
-						'label' => 'Postfix/Dovecot',
-						'commands' => Array(
-							($vmail_group === false) ? 'groupadd -g ' . $settings['system']['vmail_gid'] . ' ' . $vmail_groupname : '',
-							($vmail_user === false) ? 'useradd -u ' . $settings['system']['vmail_uid'] . ' -g ' . $vmail_groupname . ' ' . $vmail_username : '',
-							'mkdir -p ' . $settings['system']['vmail_homedir'],
-							'chown -R '.$vmail_username.':'.$vmail_groupname.' ' . $settings['system']['vmail_homedir'],
-							'apt-get install postfix postfix-mysql',
-							'mkdir -p /var/spool/postfix/etc/pam.d',
-							'mkdir -p /var/spool/postfix/var/run/mysqld',
-							'touch /etc/postfix/mysql-virtual_alias_maps.cf',
-							'touch /etc/postfix/mysql-virtual_mailbox_domains.cf',
-							'touch /etc/postfix/mysql-virtual_mailbox_maps.cf',
-							'touch /etc/postfix/mysql-virtual_sender_permissions.cf',
-							'chown root:root /etc/postfix/main.cf',
-							'chown root:root /etc/postfix/master.cf',
-							'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf',
-							'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf',
-							'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf',
-							'chown root:postfix /etc/postfix/mysql-virtual_sender_permissions.cf',
-							'chmod 0644 /etc/postfix/main.cf',
-							'chmod 0644 /etc/postfix/master.cf',
-							'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf',
-							'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf',
-							'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf',
-							'chmod 0640 /etc/postfix/mysql-virtual_sender_permissions.cf'
-						),
-						'files' => Array(
-							'etc_postfix_main.cf' => '/etc/postfix/main.cf',
-							'etc_postfix_master.cf' => '/etc/postfix/master.cf',
-							'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf',
-							'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf',
-							'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf',
-							'etc_postfix_mysql-virtual_sender_permissions.cf' => '/etc/postfix/mysql-virtual_sender_permissions.cf'
-						),
-						'restart' => Array(
-							'/etc/init.d/postfix restart',
-							'newaliases'
-						)
-					),
-					'postfix_mxaccess' => Array(
-						'label' => 'Postfix MX-Access (anti spam)',
-						'files' => Array(
-							'etc_postfix_mx_access' => '/etc/postfix/mx_access',
-							'etc_postfix_main.cf' => '/etc/postfix/main.cf'
-						),
-						'commands_1' => Array(
-							'postmap /etc/postfix/mx_access'
-						),
-						'restart' => Array(
-							'/etc/init.d/postfix restart'
-						)
-					),
-					'exim4' => Array(
-						'label' => 'Exim4',
-						'commands_1' => Array(
-							'dpkg-reconfigure exim4-config',
-							'# choose "no configuration at this time" and "splitted configuration files" in the dialog'
-						),
-						'files' => Array(
-							'etc_exim4_conf.d_acl_30_exim4-config_check_rcpt.rul' => '/etc/exim4/conf.d/acl/30_exim4-config_check_rcpt.rul',
-							'etc_exim4_conf.d_auth_30_froxlor-config' => '/etc/exim4/conf.d/auth/30_froxlor-config',
-							'etc_exim4_conf.d_main_10_froxlor-config_options' => '/etc/exim4/conf.d/main/10_froxlor-config_options',
-							'etc_exim4_conf.d_router_180_froxlor-config' => '/etc/exim4/conf.d/router/180_froxlor-config',
-							'etc_exim4_conf.d_transport_30_froxlor-config' => '/etc/exim4/conf.d/transport/30_froxlor-config'
-						),
-						'commands_2' => Array(
-							'chmod o-rx /var/lib/exim4',
-							'chmod o-rx /etc/exim4/conf.d/main/10_froxlor-config_options'
-						),
-						'restart' => Array(
-							'/etc/init.d/exim4 restart'
-						)
-					)
-				)
-			),
-			'mail' => Array(
-				'label' => $lng['admin']['configfiles']['mail'],
-				'daemons' => Array(
-					'courier' => Array(
-						'label' => 'Courier',
-						'files' => Array(
-							'etc_courier_authdaemonrc' => '/etc/courier/authdaemonrc',
-							'etc_courier_authmysqlrc' => '/etc/courier/authmysqlrc'
-						),
-						'restart' => Array(
-							'/etc/init.d/courier-authdaemon restart',
-							'/etc/init.d/courier-pop restart'
-						)
-					),
-					'dovecot' => Array(
-						'label' => 'Dovecot',
-						'commands_1' => Array(
-							'apt-get install dovecot-imapd dovecot-pop3d dovecot-postfix',
-						),
-						'files' => Array(
-							'etc_dovecot_dovecot.conf' => '/etc/dovecot/dovecot.conf',
-							'etc_dovecot_dovecot-sql.conf' => '/etc/dovecot/dovecot-sql.conf'
-						),
-						'commands_2' => Array(
-							'chmod 0640 /etc/dovecot/dovecot-sql.conf'
-						),
-						'restart' => Array(
-							'/etc/init.d/dovecot restart'
-						)
-					)
-				)
-			),
-			'ftp' => Array(
-				'label' => $lng['admin']['configfiles']['ftp'],
-				'daemons' => Array(
-					'proftpd' => Array(
-						'label' => 'ProFTPd',
-						'commands' => Array(
-							'apt-get install proftpd-basic proftpd-mod-mysql'
-						),
-						'files' => Array(
-							'etc_proftpd_modules.conf' => '/etc/proftpd/modules.conf',
-							'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf'
-						),
-						'restart' => Array(
-							'/etc/init.d/proftpd restart'
-						)
-					),
-					'pure-ftpd' => Array(
-						'label' => 'Pure FTPd',
-						'commands_1' => Array(
-							'apt-get install pure-ftpd-common pure-ftpd-mysql'
-						),
-						'files' => Array(
-							'etc_pure-ftpd_conf_MinUID' => '/etc/pure-ftpd/conf/MinUID',
-							'etc_pure-ftpd_conf_MySQLConfigFile' => '/etc/pure-ftpd/conf/MySQLConfigFile',
-							'etc_pure-ftpd_conf_NoAnonymous' => '/etc/pure-ftpd/conf/NoAnonymous',
-							'etc_pure-ftpd_conf_MaxIdleTime' => '/etc/pure-ftpd/conf/MaxIdleTime',
-							'etc_pure-ftpd_conf_ChrootEveryone' => '/etc/pure-ftpd/conf/ChrootEveryone',
-							'etc_pure-ftpd_conf_PAMAuthentication' => '/etc/pure-ftpd/conf/PAMAuthentication',
-							'etc_pure-ftpd_db_mysql.conf' => '/etc/pure-ftpd/db/mysql.conf',
-							'etc_pure-ftpd_conf_CustomerProof' => '/etc/pure-ftpd/conf/CustomerProof',
-							'etc_pure-ftpd_conf_Bind' => '/etc/pure-ftpd/conf/Bind',
-							'etc_default_pure-ftpd-common' => '/etc/default/pure-ftpd-common'
-						),
-						'commands_2' => Array(
-							'chmod 0640 /etc/pure-ftpd/db/mysql.conf'
-						),
-						'restart' => Array(
-							'/etc/init.d/pure-ftpd-mysql restart'
-						)
-					),
-				)
-			),
-			'etc' => Array(
-				'label' => $lng['admin']['configfiles']['etc'],
-				'daemons' => Array(
-					'cron' => Array(
-						'label' => 'Crond (cronscript)',
-						'files' => Array(
-							'etc_cron.d_froxlor' => '/etc/cron.d/froxlor'
-						),
-						'restart' => Array(
-							'/etc/init.d/cron restart'
-						)
-					),
-					'awstats' => Array(
-						'label' => 'Awstats',
-						'commands' => Array(
-							'apt-get install awstats',
-							'cp /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl '.makeCorrectDir($settings['system']['awstats_path']),
-							'mv '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf').' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
-							'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
-							'# Please make sure you deactivate awstats own cronjob as Froxlor handles that itself',
-							'rm /etc/cron.d/awstats'
-						),
-					),
-					'libnss' => Array(
-						'label' => 'libnss (system login with mysql)',
-						'commands' => Array(
-							'apt-get install libnss-mysql nscd',
-							'chmod 600 /etc/nss-mysql.conf /etc/nss-mysql-root.conf'
-						),
-						'files' => Array(
-							'etc_nss-mysql.conf' => '/etc/nss-mysql.conf',
-							'etc_nss-mysql-root.conf' => '/etc/nss-mysql-root.conf',
-							'etc_nsswitch.conf' => '/etc/nsswitch.conf',
-						),
-						'restart' => Array(
-							'/etc/init.d/nscd restart'
-						)
-					)
-				)
-			)
-		)
-	)
-);
-
-?>
diff --git a/lib/configfiles_index.inc.php b/lib/configfiles_index.inc.php
index 180b5974..bee17fc1 100644
--- a/lib/configfiles_index.inc.php
+++ b/lib/configfiles_index.inc.php
@@ -45,5 +45,5 @@ else
 
 $cfgPath = 'lib/configfiles/';
 $configfiles = Array();
-$configfiles = array_merge(include $cfgPath . 'squeeze.inc.php', include $cfgPath . 'precise.inc.php', include $cfgPath . 'lucid.inc.php', include $cfgPath . 'hardy.inc.php', include $cfgPath . 'gentoo.inc.php', include $cfgPath . 'suse11.inc.php', include $cfgPath . 'sle10.inc.php', include $cfgPath . 'freebsd.inc.php');
+$configfiles = array_merge(include $cfgPath . 'squeeze.inc.php', include $cfgPath . 'precise.inc.php', include $cfgPath . 'lucid.inc.php', include $cfgPath . 'gentoo.inc.php', include $cfgPath . 'suse11.inc.php', include $cfgPath . 'sle10.inc.php', include $cfgPath . 'freebsd.inc.php');
 
diff --git a/templates/misc/configfiles/gentoo/dovecot/etc_dovecot_dovecot-sql.conf b/templates/misc/configfiles/gentoo/dovecot/etc_dovecot_dovecot-sql.conf
index caf9d566..6e3fe332 100644
--- a/templates/misc/configfiles/gentoo/dovecot/etc_dovecot_dovecot-sql.conf
+++ b/templates/misc/configfiles/gentoo/dovecot/etc_dovecot_dovecot-sql.conf
@@ -3,3 +3,4 @@ connect = host=<SQL_HOST> dbname=<SQL_DB> user=<SQL_UNPRIVILEGED_USER> password=
 default_pass_scheme = CRYPT
 password_query = "SELECT username AS user, password_enc AS password, CONCAT(homedir, maildir) AS userdb_home, uid AS userdb_uid, gid AS userdb_gid, CONCAT('maildir:', homedir, maildir) AS userdb_mail, CONCAT('*:storage=', quota,'M') AS userdb_quota_rule FROM mail_users WHERE (username = '%u' OR email = '%u') AND ((imap = 1 AND '%Ls' = 'imap') OR (pop3 = 1 AND '%Ls' = 'pop3') OR '%Ls' = 'smtp')"
 user_query = "SELECT CONCAT(homedir, maildir) AS home, CONCAT('maildir:', homedir, maildir) AS mail, uid, gid, CONCAT('*:storage=', quota,'M') AS quota_rule FROM mail_users WHERE (username = '%u' OR email = '%u')"
+iterate_query = "SELECT username AS user FROM mail_users WHERE (imap = 1 OR pop3 = 1)"
diff --git a/templates/misc/configfiles/gentoo/dovecot/etc_dovecot_dovecot.conf b/templates/misc/configfiles/gentoo/dovecot/etc_dovecot_dovecot.conf
index 64f3dd17..971b2628 100644
--- a/templates/misc/configfiles/gentoo/dovecot/etc_dovecot_dovecot.conf
+++ b/templates/misc/configfiles/gentoo/dovecot/etc_dovecot_dovecot.conf
@@ -1,72 +1,65 @@
-base_dir = /var/run/dovecot
-protocols = imap pop3 <SSLPROTOCOLS>
+auth_mechanisms = plain login
+## allow Plaintext Logins from foreign IP if the Connection doesn't use TLS
+disable_plaintext_auth = no
 listen = *
 mail_access_groups = vmail
 mail_debug = no
-## allow Plaintext Logins from foreign IP if the Connection doesn't use TLS
-disable_plaintext_auth = no
+
+protocols = imap pop3
 
 ### SSL Settings
-### After setting this options, set disable_plaintext_auth to yes (see above)
-### and add imaps pop3s to the protocols
-#ssl_cert_file = /etc/ssl/server/<SERVERNAME>.pem
-#ssl_key_file = /etc/ssl/server/<SERVERNAME>.key
-## This is an example with CACerts class3 cert!
-#ssl_ca_file = /path/to/cacert.class3.crt
-#ssl_cipher_list = ALL:!LOW:!SSLv2
+### After you obtained an SSL-certificate enable ssl here and 
+### set disable_plaintext_auth to yes (see above)
+ssl = no
+#ssl_cert = </etc/ssl/server/<SERVERNAME>.pem
+#ssl_key = </etc/ssl/server/<SERVERNAME>.key
+
+passdb {
+	args = /etc/dovecot/dovecot-sql.conf
+	driver = sql
+}
+
+plugin {
+	quota = maildir:User Quota
+}
+
+service auth {
+	unix_listener /var/spool/postfix/private/auth {
+		group = postfix
+		mode = 0660
+		user = postfix
+	}
+	unix_listener auth-master {
+		group = vmail
+		mode = 0660
+		user = vmail
+	}
+}
+
+userdb {
+	driver = prefetch
+}
+
+userdb {
+	args = /etc/dovecot/dovecot-sql.conf
+	driver = sql
+}
 
 protocol imap {
 	mail_plugins = quota imap_quota
 }
 
 protocol pop3 {
-    # leave this uncommented if you are migrating from Courier also see Migration from Courier
-    pop3_uidl_format = UID%u-%v
-    mail_plugins = quota
-    
-}
-protocol lda {
-	# postmaster is the one in charge of the mail system. MUST be set to a valid address!
-    postmaster_address = admin@<SERVERNAME>
-    auth_socket_path = /var/run/dovecot/auth-master
-    mail_plugins = quota
-    sendmail_path = /usr/sbin/sendmail
+	mail_plugins = quota
+	pop3_uidl_format = UID%u-%v
 }
 
-auth default {
-    mechanisms = plain login
-    passdb sql {
-        args = /etc/dovecot/dovecot-sql.conf
-    }
-    
-    userdb prefetch {
-    }
-    
-    userdb sql {
-        args = /etc/dovecot/dovecot-sql.conf
-    }
-    
-    user = vmail
-    socket listen {
-    	# Postfix uses the client socket for SMTP Auth
-        client {
-            # Assuming the default Postfix $queue_directory setting
-            path = /var/spool/postfix/private/auth
-            mode = 0660
-            # Assuming the default Postfix user and group
-            user = postfix
-            group = postfix
-        }
-        # Note that we're setting a master socket. SMTP AUTH for Postfix and Exim uses client sockets.
-        master {
-			path = /var/run/dovecot/auth-master
-			mode = 0660
-			user = vmail
-			group = vmail
-    }
-        
-    }
-}
-plugin {
-	quota = maildir:User Quota
+lda_mailbox_autocreate = yes
+protocol lda {
+	auth_socket_path = /var/run/dovecot/auth-master
+	mail_plugins = quota
+	# postmaster is the one in charge of the mail system. MUST be set to a valid address!
+	postmaster_address = admin@<SERVERNAME>
+	sendmail_path = /usr/sbin/sendmail
+	lda_mailbox_autocreate = 1
 }
diff --git a/templates/misc/configfiles/gentoo/dovecot2/etc_dovecot_dovecot-sql.conf b/templates/misc/configfiles/gentoo/dovecot2/etc_dovecot_dovecot-sql.conf
deleted file mode 100644
index 6e3fe332..00000000
--- a/templates/misc/configfiles/gentoo/dovecot2/etc_dovecot_dovecot-sql.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-driver = mysql
-connect = host=<SQL_HOST> dbname=<SQL_DB> user=<SQL_UNPRIVILEGED_USER> password=<SQL_UNPRIVILEGED_PASSWORD>
-default_pass_scheme = CRYPT
-password_query = "SELECT username AS user, password_enc AS password, CONCAT(homedir, maildir) AS userdb_home, uid AS userdb_uid, gid AS userdb_gid, CONCAT('maildir:', homedir, maildir) AS userdb_mail, CONCAT('*:storage=', quota,'M') AS userdb_quota_rule FROM mail_users WHERE (username = '%u' OR email = '%u') AND ((imap = 1 AND '%Ls' = 'imap') OR (pop3 = 1 AND '%Ls' = 'pop3') OR '%Ls' = 'smtp')"
-user_query = "SELECT CONCAT(homedir, maildir) AS home, CONCAT('maildir:', homedir, maildir) AS mail, uid, gid, CONCAT('*:storage=', quota,'M') AS quota_rule FROM mail_users WHERE (username = '%u' OR email = '%u')"
-iterate_query = "SELECT username AS user FROM mail_users WHERE (imap = 1 OR pop3 = 1)"
diff --git a/templates/misc/configfiles/gentoo/dovecot2/etc_dovecot_dovecot.conf b/templates/misc/configfiles/gentoo/dovecot2/etc_dovecot_dovecot.conf
deleted file mode 100644
index 971b2628..00000000
--- a/templates/misc/configfiles/gentoo/dovecot2/etc_dovecot_dovecot.conf
+++ /dev/null
@@ -1,65 +0,0 @@
-auth_mechanisms = plain login
-## allow Plaintext Logins from foreign IP if the Connection doesn't use TLS
-disable_plaintext_auth = no
-listen = *
-mail_access_groups = vmail
-mail_debug = no
-
-protocols = imap pop3
-
-### SSL Settings
-### After you obtained an SSL-certificate enable ssl here and 
-### set disable_plaintext_auth to yes (see above)
-ssl = no
-#ssl_cert = </etc/ssl/server/<SERVERNAME>.pem
-#ssl_key = </etc/ssl/server/<SERVERNAME>.key
-
-passdb {
-	args = /etc/dovecot/dovecot-sql.conf
-	driver = sql
-}
-
-plugin {
-	quota = maildir:User Quota
-}
-
-service auth {
-	unix_listener /var/spool/postfix/private/auth {
-		group = postfix
-		mode = 0660
-		user = postfix
-	}
-	unix_listener auth-master {
-		group = vmail
-		mode = 0660
-		user = vmail
-	}
-}
-
-userdb {
-	driver = prefetch
-}
-
-userdb {
-	args = /etc/dovecot/dovecot-sql.conf
-	driver = sql
-}
-
-protocol imap {
-	mail_plugins = quota imap_quota
-}
-
-protocol pop3 {
-	mail_plugins = quota
-	pop3_uidl_format = UID%u-%v
-}
-
-lda_mailbox_autocreate = yes
-protocol lda {
-	auth_socket_path = /var/run/dovecot/auth-master
-	mail_plugins = quota
-	# postmaster is the one in charge of the mail system. MUST be set to a valid address!
-	postmaster_address = admin@<SERVERNAME>
-	sendmail_path = /usr/sbin/sendmail
-	lda_mailbox_autocreate = 1
-}
diff --git a/templates/misc/configfiles/ubuntu_hardy/apache2/etc_apache2_mods-enabled_fastcgi.conf b/templates/misc/configfiles/ubuntu_hardy/apache2/etc_apache2_mods-enabled_fastcgi.conf
deleted file mode 100644
index 704727c5..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/apache2/etc_apache2_mods-enabled_fastcgi.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-<IfModule mod_fastcgi.c>
-    FastCgiWrapper /usr/lib/apache2/suexec
-    FastCgiIpcDir /var/run/apache2/
-
-    <Location "/fastcgiphp">
-        Order Deny,Allow
-        Deny from All
-        # Prevent accessing this path directly
-        Allow from env=REDIRECT_STATUS
-    </Location>
-</IfModule>
diff --git a/templates/misc/configfiles/ubuntu_hardy/courier/etc_courier_authdaemonrc b/templates/misc/configfiles/ubuntu_hardy/courier/etc_courier_authdaemonrc
deleted file mode 100644
index 29346e54..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/courier/etc_courier_authdaemonrc
+++ /dev/null
@@ -1,68 +0,0 @@
-##VERSION: $Id: authdaemonrc.in,v 1.8 2001/10/07 02:16:22 mrsam Exp $
-#
-# Copyright 2000-2001 Double Precision, Inc.  See COPYING for
-# distribution information.
-#
-# authdaemonrc created from authdaemonrc.dist by sysconftool
-#
-# Do not alter lines that begin with ##, they are used when upgrading
-# this configuration.
-#
-# This file configures authdaemond, the resident authentication daemon.
-#
-# Comments in this file are ignored.  Although this file is intended to
-# be sourced as a shell script, authdaemond parses it manually, so
-# the acceptable syntax is a bit limited.  Multiline variable contents,
-# with the \ continuation character, are not allowed.  Everything must
-# fit on one line.  Do not use any additional whitespace for indentation,
-# or anything else.
-
-##NAME: authmodulelist:0
-#
-# The authentication modules that are linked into authdaemond.  The
-# default list is installed.  You may selectively disable modules simply
-# by removing them from the following list.  The available modules you
-# can use are: authcustom authcram authuserdb authldap authmysql authpam
-
-authmodulelist="authmysql"
-
-##NAME: authmodulelistorig:1
-#
-# This setting is used by Courier's webadmin module, and should be left
-# alone
-
-authmodulelistorig="authcustom authcram authuserdb authldap authmysql authpam"
-
-##NAME: daemons:0
-#
-# The number of daemon processes that are started.  authdaemon is typically
-# installed where authentication modules are relatively expensive: such
-# as authldap, or authmysql, so it's better to have a number of them running.
-# PLEASE NOTE:  Some platforms may experience a problem if there's more than
-# one daemon.  Specifically, SystemV derived platforms that use TLI with
-# socket emulation.  I'm suspicious of TLI's ability to handle multiple
-# processes accepting connections on the same filesystem domain socket.
-#
-# You may need to increase daemons if as your system load increases.  Symptoms
-# include sporadic authentication failures.  If you start getting
-# authentication failures, increase daemons.  However, the default of 5
-# SHOULD be sufficient.  Bumping up daemon count is only a short-term
-# solution.  The permanent solution is to add more resources: RAM, faster
-# disks, faster CPUs...
-
-daemons=5
-
-##NAME: version:0
-#
-# When you have multiple versions of authdaemond.* installed, authdaemond
-# just picks the first one it finds.  Set "version" to override that.
-# For example:  version=authdaemond.plain
-
-version=""
-
-##NAME: authdaemonvar:0
-#
-# authdaemonvar is here, but is not used directly by authdaemond.  It's
-# used by various configuration and build scripts, so don't touch it!
-
-authdaemonvar=/var/run/courier/authdaemon
diff --git a/templates/misc/configfiles/ubuntu_hardy/courier/etc_courier_authmysqlrc b/templates/misc/configfiles/ubuntu_hardy/courier/etc_courier_authmysqlrc
deleted file mode 100644
index 8e5eef90..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/courier/etc_courier_authmysqlrc
+++ /dev/null
@@ -1,14 +0,0 @@
-MYSQL_SERVER <SQL_HOST>
-MYSQL_USERNAME <SQL_UNPRIVILEGED_USER>
-MYSQL_PASSWORD <SQL_UNPRIVILEGED_PASSWORD>
-MYSQL_PORT 3306
-MYSQL_DATABASE <SQL_DB>
-MYSQL_USER_TABLE mail_users
-MYSQL_CRYPT_PWFIELD password_enc
-MYSQL_UID_FIELD uid
-MYSQL_GID_FIELD gid
-MYSQL_LOGIN_FIELD username
-MYSQL_HOME_FIELD homedir
-MYSQL_MAILDIR_FIELD maildir
-MYSQL_QUOTA_FIELD (quota*1024*1024)
-MYSQL_AUXOPTIONS_FIELD CONCAT("allowimap=",imap,",allowpop3=",pop3)
diff --git a/templates/misc/configfiles/ubuntu_hardy/cron/etc_cron.d_froxlor b/templates/misc/configfiles/ubuntu_hardy/cron/etc_cron.d_froxlor
deleted file mode 100644
index 86a93796..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/cron/etc_cron.d_froxlor
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Set PATH, otherwise restart-scripts won't find start-stop-daemon
-#
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-#
-# Regular cron jobs for the froxlor package
-#
-*/5 * * * *	root	nice -n 5	/usr/bin/php5 -q <BASE_PATH>scripts/froxlor_master_cronjob.php
diff --git a/templates/misc/configfiles/ubuntu_hardy/dkim/dkim-filter.conf b/templates/misc/configfiles/ubuntu_hardy/dkim/dkim-filter.conf
deleted file mode 100644
index ddb594b7..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/dkim/dkim-filter.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# !!! DO NOT REPLACE THE ORIGINAL CONFIG WITH THIS FILE !!!
-#
-# Instead, just set the shown values in the file to the
-# given values ;-)
-#
-
-Syslog			yes
-Domain			/etc/postfix/dkim/domains
-KeyList			/etc/postfix/dkim/dkim-keys.conf
-Socket                  inet:8891@localhost
diff --git a/templates/misc/configfiles/ubuntu_hardy/dovecot/etc_dovecot_dovecot-sql.conf b/templates/misc/configfiles/ubuntu_hardy/dovecot/etc_dovecot_dovecot-sql.conf
deleted file mode 100644
index c6f896aa..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/dovecot/etc_dovecot_dovecot-sql.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-driver = mysql
-connect = host=<SQL_HOST> dbname=<SQL_DB> user=<SQL_UNPRIVILEGED_USER> password=<SQL_UNPRIVILEGED_PASSWORD>
-default_pass_scheme = CRYPT
-password_query = SELECT username AS user, password_enc AS password, CONCAT(homedir, maildir) AS userdb_home, uid AS userdb_uid, gid AS userdb_gid,  CONCAT('maildir:', homedir, maildir) AS userdb_mail, CONCAT('maildir:storage=', (quota*1024)) as userdb_quota FROM mail_users WHERE (username = '%u' OR email = '%u') AND ((imap = 1 AND '%Ls' = 'imap') OR (pop3 = 1 AND '%Ls' = 'pop3') OR '%Ls' = 'smtp')
-user_query = SELECT CONCAT(homedir, maildir) AS home, CONCAT('maildir:', homedir, maildir) AS mail, uid, gid, CONCAT('*:storage=', (quota*1024)) as quota_rule FROM mail_users WHERE (username = '%u' OR email = '%u')
diff --git a/templates/misc/configfiles/ubuntu_hardy/dovecot/etc_dovecot_dovecot.conf b/templates/misc/configfiles/ubuntu_hardy/dovecot/etc_dovecot_dovecot.conf
deleted file mode 100644
index be337f54..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/dovecot/etc_dovecot_dovecot.conf
+++ /dev/null
@@ -1,71 +0,0 @@
-protocols = imap pop3 <SSLPROTOCOLS>
-listen = *
-mail_access_groups = vmail
-mail_debug = no
-## Uncomment this line to allow Plaintext Logins from foreign IP if the Connection doesn't use TLS
-disable_plaintext_auth = no
-
-### SSL Settings
-### After setting this options, set disable_plaintext_auth to yes (see above)
-### and add imaps pop3s to the protocols
-#ssl_cert_file = /etc/ssl/server/<SERVERNAME>.pem
-#ssl_key_file = /etc/ssl/server/<SERVERNAME>.key
-## This is an example with CACerts class3 cert!
-#ssl_ca_file = /path/to/cacert.class3.crt
-#ssl_cipher_list = ALL:!LOW:!SSLv2
-
-protocol imap {
-	mail_plugins = quota imap_quota
-}
-
-protocol pop3 {
-    # Uncomment this line if you are migrating from Courier also see Migration from Courier
-    pop3_uidl_format = UID%u-%v
-    mail_plugins = quota
-    
-}
-protocol lda {
-	# postmaster is the one in charge of the mail system. MUST be set to a vailid address!
-    postmaster_address = <postmaster-address>
-    auth_socket_path = /var/run/dovecot/auth-master
-    mail_plugins = quota
-    sendmail_path = /usr/sbin/sendmail
-}
-
-auth default {
-    mechanisms = plain login
-    passdb sql {
-        args = /etc/dovecot/dovecot-sql.conf
-    }
-    
-    userdb prefetch {
-    }
-    
-    userdb sql {
-        args = /etc/dovecot/dovecot-sql.conf
-    }
-    
-    user = vmail
-    socket listen {
-    	# Postfix uses the client socket for SMTP Auth
-        client {
-            # Assuming the default Postfix $queue_directory setting
-            path = /var/spool/postfix/private/auth
-            mode = 0660
-            # Assuming the default Postfix user and group
-            user = postfix
-            group = postfix
-        }
-        # Note that we're setting a master socket. SMTP AUTH for Postfix and Exim uses client sockets.
-        master {
-			path = /var/run/dovecot/auth-master
-			mode = 0660
-			user = vmail
-			group = vmail
-    }
-        
-    }
-}
-plugin {
-	quota = maildir
-}
diff --git a/templates/misc/configfiles/ubuntu_hardy/exim4/etc_exim4_conf.d_acl_30_exim4-config_check_rcpt.rul b/templates/misc/configfiles/ubuntu_hardy/exim4/etc_exim4_conf.d_acl_30_exim4-config_check_rcpt.rul
deleted file mode 100644
index 93bf877e..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/exim4/etc_exim4_conf.d_acl_30_exim4-config_check_rcpt.rul
+++ /dev/null
@@ -1,125 +0,0 @@
-### acl/30_exim4-config_check_rcpt
-#################################
-
-acl_check_rcpt:
-  accept
-    hosts = :
-
-  warn
-    hosts = +relay_from_hosts
-    control = submission/sender_retain
-
-  .ifdef CHECK_RCPT_LOCAL_LOCALPARTS
-  deny
-    domains = +local_domains:+froxlor_domain
-    local_parts = CHECK_RCPT_LOCAL_LOCALPARTS
-    message = restricted characters in address
-  .endif
-
-  .ifdef CHECK_RCPT_REMOTE_LOCALPARTS
-  deny
-    domains = !+local_domains
-    local_parts = CHECK_RCPT_REMOTE_LOCALPARTS
-    message = restricted characters in address
-  .endif
-
-  accept
-    .ifndef CHECK_RCPT_POSTMASTER
-    local_parts = postmaster
-    .else
-    local_parts = CHECK_RCPT_POSTMASTER
-    .endif
-    domains = +local_domains:+froxlor_domain
-
-  deny
-    message = sender envelope address $sender_address is locally blacklisted here. If you think this is wrong, get in touch with postmaster
-    !acl = acl_local_deny_exceptions
-    senders = ${if exists{CONFDIR/local_sender_blacklist}\
-                   {CONFDIR/local_sender_blacklist}\
-                   {}}
-
-  deny
-    message = sender IP address $sender_host_address is locally blacklisted here. If you think this is wrong, get in touch with postmaster
-    !acl = acl_local_deny_exceptions
-    hosts = ${if exists{CONFDIR/local_host_blacklist}\
-                 {CONFDIR/local_host_blacklist}\
-                 {}}
-
-  .ifdef CHECK_RCPT_VERIFY_SENDER
-  deny
-    message = Sender verification failed
-    !acl = acl_local_deny_exceptions
-    !verify = sender
-  .endif
-
-  deny
-    !acl = acl_local_deny_exceptions
-    senders = ${if exists{CONFDIR/local_sender_callout}\
-                         {CONFDIR/local_sender_callout}\
-                   {}}
-    !verify = sender/callout
-
-  deny
-    !acl = acl_local_deny_exceptions
-    recipients = ${if exists{CONFDIR/local_rcpt_callout}\
-                            {CONFDIR/local_rcpt_callout}\
-                      {}}
-    !verify = recipient/callout
-
-  .ifdef CHECK_RCPT_REVERSE_DNS
-  warn
-    message = X-Host-Lookup-Failed: Reverse DNS lookup failed for $sender_host_address (${if eq{$host_lookup_failed}{1}{failed}{deferred}})
-     condition = ${if and{{def:sender_host_address}{!def:sender_host_name}}\
-                      {yes}{no}}
-  .endif
-
-  .ifdef CHECK_RCPT_IP_DNSBLS
-  warn
-    message = X-Warning: $sender_host_address is listed at $dnslist_domain ($dnslist_value: $dnslist_text)
-    log_message = $sender_host_address is listed at $dnslist_domain ($dnslist_value: $dnslist_text)
-    dnslists = CHECK_RCPT_IP_DNSBLS
-  .endif
-
-  .ifdef CHECK_RCPT_DOMAIN_DNSBLS
-  warn
-    message = X-Warning: $sender_address_domain is listed at $dnslist_domain ($dnslist_value: $dnslist_text)
-    log_message = $sender_address_domain is listed at $dnslist_domain ($dnslist_value: $dnslist_text)
-    !senders = ${if exists{CONFDIR/local_domain_dnsbl_whitelist}\
-                    {CONFDIR/local_domain_dnsbl_whitelist}\
-                    {}}
-    dnslists = CHECK_RCPT_DOMAIN_DNSBLS/$sender_address_domain
-  .endif
-
-  .ifdef CHECK_RCPT_LOCAL_ACL_FILE
-  .include CHECK_RCPT_LOCAL_ACL_FILE
-  .endif
-
-  accept
-    domains = +local_domains:+froxlor_domain
-    endpass
-    message = unknown user
-    verify = recipient
-
-  accept
-    domains = +relay_to_domains
-    endpass
-    .ifdef CHECK_RCPT_GIVE_UNKNOWN_USER
-    message = ${if eq{$acl_verify_message}{Unrouteable address}{unknown user}{$acl_verify_message}}
-    .else
-    message = unrouteable address
-    .endif
-    verify = recipient
-
-  ############
-  # If control reaches this point, the domain is neither in +local_domains
-  # nor in +relay_to_domains.
-  ############
-
-  accept
-    hosts = +relay_from_hosts
-
-  accept
-    authenticated = *
-
-  deny
-    message = relay not permitted
\ No newline at end of file
diff --git a/templates/misc/configfiles/ubuntu_hardy/exim4/etc_exim4_conf.d_auth_30_froxlor-config b/templates/misc/configfiles/ubuntu_hardy/exim4/etc_exim4_conf.d_auth_30_froxlor-config
deleted file mode 100644
index b0b13de8..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/exim4/etc_exim4_conf.d_auth_30_froxlor-config
+++ /dev/null
@@ -1,30 +0,0 @@
-### auth/30_froxlor-config
-#################################
-
-plain_server:
-  driver = plaintext
-  public_name = PLAIN
-  server_condition = "${if and { \
-                        {!eq{$2}{}} \
-                        {!eq{$3}{}} \
-                        {crypteq{$3}{${lookup mysql{FROXLOR_AUTH_PLAIN}{$value}fail}}} \
-                        } {yes}{no}}"
-  server_set_id = $2
-  server_prompts = :
-#   .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS
-#   server_advertise_condition = ${if eq{$tls_cipher}{}{}{*}}
-#   .endif
-
-login_server:
-  driver = plaintext
-  public_name = LOGIN
-  server_prompts = "Username:: : Password::"
-  server_condition = "${if and { \
-                        {!eq{$1}{}} \
-                        {!eq{$2}{}} \
-                        {crypteq{$2}{${lookup mysql{FROXLOR_AUTH_LOGIN}{$value}fail}}} \
-                        } {yes}{no}}"
-  server_set_id = $1
-#   .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS
-#   server_advertise_condition = ${if eq{$tls_cipher}{}{}{*}}
-#   .endif
\ No newline at end of file
diff --git a/templates/misc/configfiles/ubuntu_hardy/exim4/etc_exim4_conf.d_main_10_froxlor-config_options b/templates/misc/configfiles/ubuntu_hardy/exim4/etc_exim4_conf.d_main_10_froxlor-config_options
deleted file mode 100644
index 8a070db6..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/exim4/etc_exim4_conf.d_main_10_froxlor-config_options
+++ /dev/null
@@ -1,20 +0,0 @@
-hide mysql_servers = <SQL_HOST>/<SQL_DB>/<SQL_UNPRIVILEGED_USER>/<SQL_UNPRIVILEGED_PASSWORD>
-
-FROXLOR_LOCAL_DOMAIN	= SELECT domain FROM panel_domains WHERE domain = '${quote_mysql:$domain}' AND isemaildomain = '1'
-
-FROXLOR_MAILALIAS		= SELECT REPLACE(destination,' ',',') FROM mail_virtual WHERE \
-				(( email = '${quote_mysql:$local_part}@${quote_mysql:$domain}' ) \
-				OR ( email = '@${quote_mysql:$domain}' AND iscatchall > 0 )) \
-				AND destination <> '' AND destination <> ' ' ORDER BY iscatchall ASC LIMIT 1
-
-FROXLOR_MAILUSER		= SELECT CONCAT(homedir,maildir) FROM mail_users WHERE \
-				email = '${quote_mysql:$local_part}@${quote_mysql:$domain}' AND postfix = 'y'
-
-FROXLOR_PARENT_DOMAIN	= SELECT parent.domain FROM `panel_domains` AS parent INNER JOIN panel_domains AS alias \
-				ON alias.domain = '${quote_mysql:$domain}' AND parent.id = alias.aliasdomain
-
-FROXLOR_AUTH_PLAIN	= SELECT password_enc FROM mail_users WHERE username = '${quote_mysql:$2}'
-
-FROXLOR_AUTH_LOGIN	= SELECT password_enc FROM mail_users WHERE username = '${quote_mysql:$1}'
-
-domainlist froxlor_domain = mysql;FROXLOR_LOCAL_DOMAIN
\ No newline at end of file
diff --git a/templates/misc/configfiles/ubuntu_hardy/exim4/etc_exim4_conf.d_router_180_froxlor-config b/templates/misc/configfiles/ubuntu_hardy/exim4/etc_exim4_conf.d_router_180_froxlor-config
deleted file mode 100644
index dbb6a020..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/exim4/etc_exim4_conf.d_router_180_froxlor-config
+++ /dev/null
@@ -1,13 +0,0 @@
-froxlor_mailalias:
-  debug_print = "R: froxlor_mailalias for $local_part@$domain"
-  driver = redirect
-  domains = +froxlor_domain
-  data = ${lookup mysql {FROXLOR_MAILALIAS}{$value}fail}
-
-froxlor_mailuser:
-  debug_print = "R: froxlor_mailuser for $local_part@$domain"
-  driver = redirect
-  domains = +froxlor_domain
-  data = ${lookup mysql {FROXLOR_MAILUSER}{$value}fail}
-  directory_transport = maildir_froxlor
-  no_more
\ No newline at end of file
diff --git a/templates/misc/configfiles/ubuntu_hardy/exim4/etc_exim4_conf.d_transport_30_froxlor-config b/templates/misc/configfiles/ubuntu_hardy/exim4/etc_exim4_conf.d_transport_30_froxlor-config
deleted file mode 100644
index 6f00c2f7..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/exim4/etc_exim4_conf.d_transport_30_froxlor-config
+++ /dev/null
@@ -1,13 +0,0 @@
-maildir_froxlor:
-  debug_print = "T: maildir_froxlor for $local_part@$domain"
-  driver = appendfile
-  create_directory
-  delivery_date_add
-  envelope_to_add
-  return_path_add
-  maildir_format
-  directory_mode = 0770
-  mode = 0660
-  mode_fail_narrower = false
-  user = 2000
-  group = 2000
\ No newline at end of file
diff --git a/templates/misc/configfiles/ubuntu_hardy/libnss/etc_nss-mysql-root.conf b/templates/misc/configfiles/ubuntu_hardy/libnss/etc_nss-mysql-root.conf
deleted file mode 100644
index 3c880f47..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/libnss/etc_nss-mysql-root.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-conf.version = 2;
-shadow.host = inet:<SQL_HOST>:3306;
-shadow.database = <SQL_DB>;
-shadow.db_user = <SQL_UNPRIVILEGED_USER>;
-shadow.db_password = <SQL_UNPRIVILEGED_PASSWORD>;
-shadow.table = ftp_users u;
-shadow.where_clause = ;
-shadow.userid_column = u.customerid;
-shadow.user_column = u.username;
-shadow.password_column = u.password;
-shadow.lastchange_column = FLOOR(UNIX_TIMESTAMP()/86400-1);
-shadow.min_column = 0;
-shadow.max_column = 99999;
-shadow.warn_column = 7;
-shadow.inact_column = -1;
-shadow.expire_column = -1;
diff --git a/templates/misc/configfiles/ubuntu_hardy/libnss/etc_nss-mysql.conf b/templates/misc/configfiles/ubuntu_hardy/libnss/etc_nss-mysql.conf
deleted file mode 100644
index 26dd9928..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/libnss/etc_nss-mysql.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-conf.version = 2;
-users.host = inet:<SQL_HOST>:3306;
-users.database = <SQL_DB>;
-users.db_user = <SQL_UNPRIVILEGED_USER>;
-users.db_password = <SQL_UNPRIVILEGED_PASSWORD>;
-users.table = ftp_users u;
-users.where_clause = u.login_enabled = 'Y';
-users.user_column = u.username;
-users.password_column = u.password;
-users.userid_column = u.customerid;
-users.uid_column = u.uid;
-users.gid_column = u.gid;
-users.realname_column = u.username;
-users.homedir_column = u.homedir;
-users.shell_column = u.shell;
-groups.group_info_table = ftp_groups g;
-groups.where_clause = ;
-groups.group_name_column = g.groupname;
-groups.groupid_column = g.id;
-groups.gid_column = g.gid;
-groups.password_column = "x";
-groups.members_table = ftp_groups ug;
-groups.member_userid_column = ug.customerid;
-groups.member_groupid_column = ug.id;
diff --git a/templates/misc/configfiles/ubuntu_hardy/libnss/etc_nsswitch.conf b/templates/misc/configfiles/ubuntu_hardy/libnss/etc_nsswitch.conf
deleted file mode 100644
index 22a74dda..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/libnss/etc_nsswitch.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# Make sure that `passwd`, `group` and `shadow` have mysql in their lines 
-# You should place mysql at the end, so that it is queried after the other mechanisams
-#
-passwd:         compat mysql
-group:          compat mysql
-shadow:         compat mysql
-
-hosts:       files dns
-networks:    files dns
-
-services:    db files
-protocols:   db files
-rpc:         db files
-ethers:      db files
-netmasks:    files
-netgroup:    files
-bootparams:  files
-
-automount:   files
-aliases:     files
\ No newline at end of file
diff --git a/templates/misc/configfiles/ubuntu_hardy/lighttpd/etc_lighttpd.conf b/templates/misc/configfiles/ubuntu_hardy/lighttpd/etc_lighttpd.conf
deleted file mode 100644
index 14e7e42f..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/lighttpd/etc_lighttpd.conf
+++ /dev/null
@@ -1,57 +0,0 @@
-###############################################################################
-# Default lighttpd.conf for Froxlor.
-###############################################################################
-var.basedir  = "/var/www"
-var.logdir   = "/var/log/lighttpd"
-var.statedir = "/var/lib/lighttpd"
-
-server.modules = (
-	"mod_rewrite",
-	"mod_redirect",
-	"mod_alias",
-	"mod_access",
-	"mod_auth",
-	"mod_fastcgi",
-	"mod_cgi",
-	"mod_accesslog"
-)
-
-server.username      = "www-data"
-server.groupname     = "www-data"
-server.document-root = var.basedir
-server.pid-file      = "/var/run/lighttpd.pid"
-accesslog.filename   = var.logdir + "/access.log"
-server.errorlog      = var.logdir  + "/error.log"
-
-server.indexfiles    = ("index.php", "index.html",
-						"index.htm", "default.htm")
-						
-server.name			 = "<SERVERNAME>"
-server.port          = 80
-server.bind          = "<SERVERIP>"
-url.access-deny = ("~", ".inc")
-
-fastcgi.server = (
-".php" => (
-		"localhost" => (
-			"socket" => "/tmp/lighttpd-fcgi-sock-lighttpd",
-			"broken-scriptfilename" => "enable",
-			"bin-path" => "/usr/bin/php5-cgi",
-			"min-procs" => 1,
-			"max-procs" => 1,
-			"max-load-per-proc" => 4,
-			"idle-timeout" => 60,
-			"bin-environment" => (
-				"UID" => "www-data",
-				"GID" => "www-data",
-				"PHP_FCGI_CHILDREN" => "0",
-				"PHP_FCGI_MAX_REQUESTS" => "10000"
-			),
-			"bin-copy-environment" => ( "" )
-		)
-	)
-)
-
-#### external configuration files
-## mimetype mapping
-include_shell "/usr/share/lighttpd/create-mime.assign.pl"
diff --git a/templates/misc/configfiles/ubuntu_hardy/nginx/etc_init.d_php-fcgi b/templates/misc/configfiles/ubuntu_hardy/nginx/etc_init.d_php-fcgi
deleted file mode 100644
index 3971ab4a..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/nginx/etc_init.d_php-fcgi
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-BIND="127.0.0.1:8888"
-USER="www-data"
-PHP_FCGI_CHILDREN="15"
-PHP_FCGI_MAX_REQUESTS="1000"
-
-PHP_CGI="/usr/bin/php-cgi"
-PHP_CGI_NAME="$(basename ${PHP_CGI})"
-PHP_CGI_ARGS="- USER=${USER} PATH=/usr/bin PHP_FCGI_CHILDREN=${PHP_FCGI_CHILDREN} PHP_FCGI_MAX_REQUESTS=${PHP_FCGI_MAX_REQUESTS} ${PHP_CGI} -b ${BIND}"
-RETVAL="0"
-
-start() {
-      echo -n "Starting PHP FastCGI: "
-      start-stop-daemon --quiet --start --background --chuid "$USER" --exec /usr/bin/env -- "$PHP_CGI_ARGS"
-      RETVAL="$?"
-      echo "${PHP_CGI_NAME}."
-}
-stop() {
-      echo -n "Stopping PHP FastCGI: "
-      killall -q -w -u "${USER} ${PHP_CGI}"
-      RETVAL="$?"
-      echo "${PHP_CGI_NAME}."
-}
-
-case "$1" in
-    start)
-      start
-  ;;
-    stop)
-      stop
-  ;;
-    restart)
-      stop
-      start
-  ;;
-    *)
-      echo "Usage: php-fastcgi {start|stop|restart}"
-      exit 1
-  ;;
-esac
-exit "$RETVAL"
diff --git a/templates/misc/configfiles/ubuntu_hardy/nginx/etc_nginx_fastcgi.conf b/templates/misc/configfiles/ubuntu_hardy/nginx/etc_nginx_fastcgi.conf
deleted file mode 100644
index 10bcaba4..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/nginx/etc_nginx_fastcgi.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-fastcgi_param GATEWAY_INTERFACE CGI/1.1;
-fastcgi_param SERVER_SOFTWARE nginx;
-fastcgi_param QUERY_STRING $query_string;
-fastcgi_param REQUEST_METHOD $request_method;
-fastcgi_param CONTENT_TYPE $content_type;
-fastcgi_param CONTENT_LENGTH $content_length;
-fastcgi_param REQUEST_URI $request_uri;
-fastcgi_param DOCUMENT_URI $document_uri;
-fastcgi_param DOCUMENT_ROOT $document_root;
-fastcgi_param SERVER_PROTOCOL $server_protocol;
-fastcgi_param REMOTE_ADDR $remote_addr;
-fastcgi_param REMOTE_PORT $remote_port;
-fastcgi_param SERVER_ADDR $server_addr;
-fastcgi_param SERVER_PORT $server_port;
-fastcgi_param SERVER_NAME $server_name;
diff --git a/templates/misc/configfiles/ubuntu_hardy/nginx/etc_nginx_nginx.conf b/templates/misc/configfiles/ubuntu_hardy/nginx/etc_nginx_nginx.conf
deleted file mode 100644
index a3f22ed0..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/nginx/etc_nginx_nginx.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-user www-data;
-worker_processes  4;
-
-pid /var/run/nginx.pid;
-
-events {
-    worker_connections  1024;
-}
-
-http {
-    include       /etc/nginx/mime.types;
-    default_type  application/octet-stream;
-
-    access_log  /var/log/nginx/access.log;
-
-    sendfile        on;
-    tcp_nodelay     on;
-
-    keepalive_timeout  65;
-
-    gzip  on;
-
-    include /etc/nginx/conf.d/*.conf;
-    include /etc/nginx/sites-enabled/*;
-}
-
diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_main.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_main.cf
deleted file mode 100644
index 94b922dc..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_main.cf
+++ /dev/null
@@ -1,80 +0,0 @@
-## General Postfix configuration
-# should be the default domain from your provider eg. "server100.provider.tld"
-mydomain = <SERVERNAME>
-
-# should be different from $mydomain eg. "mail.$mydomain"
-myhostname = mail.$mydomain
-
-mydestination = $myhostname,
-	$mydomain,
-	localhost.$myhostname,
-	localhost.$mydomain,
-	localhost
-mynetworks = 127.0.0.0/8
-inet_interfaces = all
-append_dot_mydomain = no
-biff = no
-
-# Postfix performance settings
-default_destination_concurrency_limit = 20
-local_destination_concurrency_limit = 2
-
-# SMTPD Settings
-smtpd_banner = $myhostname ESMTP $mail_name (Ubuntu)
-smtpd_helo_required = yes
-smtpd_recipient_restrictions = permit_mynetworks,
-	permit_sasl_authenticated,
-	reject_unauth_destination,
-	reject_unauth_pipelining,
-	reject_non_fqdn_recipient
-smtpd_sender_restrictions = permit_mynetworks,
-	reject_sender_login_mismatch,
-	permit_sasl_authenticated, 
-	reject_unknown_helo_hostname, 
-	reject_unknown_recipient_domain, 
-	reject_unknown_sender_domain
-smtpd_client_restrictions = permit_mynetworks,
-	permit_sasl_authenticated,
-	reject_unknown_client_hostname
-# Maximum size of Message in bytes (50MB)
-message_size_limit = 52428800
-
-## SASL Auth Settings
-smtpd_sasl_auth_enable = yes
-smtpd_sasl_local_domain = $myhostname
-broken_sasl_auth_clients = yes
-
-# Virtual delivery settings
-virtual_mailbox_base = <VIRTUAL_MAILBOX_BASE>
-virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf
-virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf
-virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf
-smtpd_sender_login_maps = mysql:/etc/postfix/mysql-virtual_sender_permissions.cf
-virtual_uid_maps = static:<VIRTUAL_UID_MAPS>
-virtual_gid_maps = static:<VIRTUAL_GID_MAPS>
-
-# Local delivery settings
-local_transport = local
-alias_maps = $alias_database
-
-# Default Mailbox size, is set to 0 which means unlimited!
-mailbox_size_limit = 0
-virtual_mailbox_limit = 0
-
-### TLS settings
-###
-## TLS for outgoing mails from the server to another server
-#smtp_tls_security_level = may
-#smtp_tls_note_starttls_offer = yes
-## TLS for email client
-#smtpd_tls_security_level = may
-#smtpd_tls_cert_file = /etc/ssl/server/<SERVERNAME>.pem
-#smtpd_tls_key_file = $smtpd_tls_cert_file
-#smtpd_tls_CAfile = /etc/ssl/certs/ca-certificates.crt
-#smtpd_tls_loglevel = 1
-#smtpd_tls_received_header = yes
-
-debugger_command =
-         PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
-         ddd $daemon_directory/$process_name $process_id & sleep 5
-
diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf
deleted file mode 100644
index a9e71f83..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf
+++ /dev/null
@@ -1,8 +0,0 @@
-user = <SQL_UNPRIVILEGED_USER>
-password = <SQL_UNPRIVILEGED_PASSWORD>
-dbname = <SQL_DB>
-table = mail_virtual
-select_field = destination
-where_field = email
-additional_conditions = and TRIM(destination) <> ''
-hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf
deleted file mode 100644
index 4484bee2..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf
+++ /dev/null
@@ -1,8 +0,0 @@
-user = <SQL_UNPRIVILEGED_USER>
-password = <SQL_UNPRIVILEGED_PASSWORD>
-dbname = <SQL_DB>
-table = panel_domains
-select_field = domain
-where_field = domain
-additional_conditions = and isemaildomain = '1'
-hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf
deleted file mode 100644
index 7e0f79af..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf
+++ /dev/null
@@ -1,7 +0,0 @@
-user = <SQL_UNPRIVILEGED_USER>
-password = <SQL_UNPRIVILEGED_PASSWORD>
-dbname = <SQL_DB>
-table = mail_users
-select_field = maildir
-where_field = email
-hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf
deleted file mode 100644
index 410be470..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf
+++ /dev/null
@@ -1,5 +0,0 @@
-user = <SQL_UNPRIVILEGED_USER>
-password = <SQL_UNPRIVILEGED_PASSWORD>
-dbname = <SQL_DB>
-query = select distinct username from mail_users where email in ((select mail_virtual.email_full from mail_virtual where mail_virtual.email = '%s' union select mail_virtual.destination from mail_virtual where mail_virtual.email = '%s'));
-hosts = <SQL_HOST>
diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_sasl_smtpd.conf b/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_sasl_smtpd.conf
deleted file mode 100644
index de3699d8..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_sasl_smtpd.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-pwcheck_method: auxprop
-auxprop_plugin: sql
-allowanonymouslogin: no
-allowplaintext: yes
-mech_list: plain login cram-md5 digest-md5
-sql_engine: mysql
-sql_hostnames: <SQL_HOST>
-sql_user: <SQL_UNPRIVILEGED_USER>
-sql_passwd: <SQL_UNPRIVILEGED_PASSWORD>
-sql_database: <SQL_DB>
-sql_select: SELECT password FROM mail_users WHERE username='%u@%r' OR email='%u@%r'
\ No newline at end of file
diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_main.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_main.cf
deleted file mode 100644
index 9c41e52b..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_main.cf
+++ /dev/null
@@ -1,86 +0,0 @@
-## General Postfix configuration
-# should be the default domain from your provider eg. "server100.provider.tld"
-mydomain = <SERVERNAME>
-
-# should be different from $mydomain eg. "mail.$mydomain"
-myhostname = mail.$mydomain
-
-mydestination = $myhostname,
-	$mydomain,
-	localhost.$myhostname,
-	localhost.$mydomain,
-	localhost
-mynetworks = 127.0.0.0/8
-inet_interfaces = all
-append_dot_mydomain = no
-biff = no
-
-# Postfix performance settings
-default_destination_concurrency_limit = 20
-local_destination_concurrency_limit = 2
-
-# SMTPD Settings
-smtpd_banner = $myhostname ESMTP $mail_name (Ubuntu)
-smtpd_helo_required = yes
-smtpd_recipient_restrictions = permit_mynetworks,
-	permit_sasl_authenticated,
-	reject_unauth_destination,
-	reject_unauth_pipelining,
-	reject_non_fqdn_recipient
-smtpd_sender_restrictions = permit_mynetworks,
-	reject_sender_login_mismatch,
-	permit_sasl_authenticated, 
-	reject_unknown_helo_hostname, 
-	reject_unknown_recipient_domain, 
-	reject_unknown_sender_domain
-smtpd_client_restrictions = permit_mynetworks,
-	permit_sasl_authenticated,
-	reject_unknown_client_hostname
-# Maximum size of Message in bytes (50MB)
-message_size_limit = 52428800
-
-## SASL Auth Settings
-smtpd_sasl_auth_enable = yes
-smtpd_sasl_local_domain = $myhostname
-broken_sasl_auth_clients = yes
-## Dovecot Settings for deliver, SASL Auth and virtual transport
-smtpd_sasl_type = dovecot
-mailbox_command = /usr/lib/dovecot/deliver
-virtual_transport = dovecot
-dovecot_destination_recipient_limit = 1
-smtpd_sasl_path = private/auth
-
-# Virtual delivery settings
-virtual_mailbox_base = <VIRTUAL_MAILBOX_BASE>
-virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf
-virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf
-virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf
-smtpd_sender_login_maps = mysql:/etc/postfix/mysql-virtual_sender_permissions.cf
-virtual_uid_maps = static:<VIRTUAL_UID_MAPS>
-virtual_gid_maps = static:<VIRTUAL_GID_MAPS>
-
-# Local delivery settings
-local_transport = local
-alias_maps = $alias_database
-
-# Default Mailbox size, is set to 0 which means unlimited!
-mailbox_size_limit = 0
-virtual_mailbox_limit = 0
-
-### TLS settings
-###
-## TLS for outgoing mails from the server to another server
-#smtp_tls_security_level = may
-#smtp_tls_note_starttls_offer = yes
-## TLS for email client
-#smtpd_tls_security_level = may
-#smtpd_tls_cert_file = /etc/ssl/server/<SERVERNAME>.pem
-#smtpd_tls_key_file = $smtpd_tls_cert_file
-#smtpd_tls_CAfile = /etc/ssl/certs/ca-certificates.crt
-#smtpd_tls_loglevel = 1
-#smtpd_tls_received_header = yes
-
-debugger_command =
-         PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
-         ddd $daemon_directory/$process_name $process_id & sleep 5
-
diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_master.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_master.cf
deleted file mode 100644
index 678bb9cd..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_master.cf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Add this lines to be able to use dovecot as delivery agent
-# Dovecot LDA
-dovecot	  unix	-	n	n	-	-	pipe
-	flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -d ${recipient}
diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf
deleted file mode 100644
index a9e71f83..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf
+++ /dev/null
@@ -1,8 +0,0 @@
-user = <SQL_UNPRIVILEGED_USER>
-password = <SQL_UNPRIVILEGED_PASSWORD>
-dbname = <SQL_DB>
-table = mail_virtual
-select_field = destination
-where_field = email
-additional_conditions = and TRIM(destination) <> ''
-hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf
deleted file mode 100644
index 4484bee2..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf
+++ /dev/null
@@ -1,8 +0,0 @@
-user = <SQL_UNPRIVILEGED_USER>
-password = <SQL_UNPRIVILEGED_PASSWORD>
-dbname = <SQL_DB>
-table = panel_domains
-select_field = domain
-where_field = domain
-additional_conditions = and isemaildomain = '1'
-hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf
deleted file mode 100644
index 7e0f79af..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf
+++ /dev/null
@@ -1,7 +0,0 @@
-user = <SQL_UNPRIVILEGED_USER>
-password = <SQL_UNPRIVILEGED_PASSWORD>
-dbname = <SQL_DB>
-table = mail_users
-select_field = maildir
-where_field = email
-hosts = <SQL_HOST> 
diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf
deleted file mode 100644
index 410be470..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_sender_permissions.cf
+++ /dev/null
@@ -1,5 +0,0 @@
-user = <SQL_UNPRIVILEGED_USER>
-password = <SQL_UNPRIVILEGED_PASSWORD>
-dbname = <SQL_DB>
-query = select distinct username from mail_users where email in ((select mail_virtual.email_full from mail_virtual where mail_virtual.email = '%s' union select mail_virtual.destination from mail_virtual where mail_virtual.email = '%s'));
-hosts = <SQL_HOST>
diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_mxaccess/etc_postfix_main.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_mxaccess/etc_postfix_main.cf
deleted file mode 100644
index 82b23a03..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/postfix_mxaccess/etc_postfix_main.cf
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# ATTENTION - this is not the full postfix-main.cf file
-#
-# it only provides additional configuration-entries!
-#
-
-#
-# look for the follow statement
-#
-smtpd_recipient_restrictions = permit_mynetworks,
-	permit_sasl_authenticated,
-	reject_unauth_destination,
-	reject_unauth_pipelining,
-	reject_non_fqdn_recipient
-
-#
-# and extend it with the following line
-# so it looks like this
-#
-smtpd_recipient_restrictions = permit_mynetworks,
-	permit_sasl_authenticated,
-	reject_unauth_destination,
-	reject_unauth_pipelining,
-	reject_non_fqdn_recipient,
-	check_recipient_mx_access cidr:/etc/postfix/mx_access
diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_mxaccess/etc_postfix_mx_access b/templates/misc/configfiles/ubuntu_hardy/postfix_mxaccess/etc_postfix_mx_access
deleted file mode 100644
index 18a1ec5f..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/postfix_mxaccess/etc_postfix_mx_access
+++ /dev/null
@@ -1,9 +0,0 @@
-0.0.0.0/8         REJECT Domain MX in broadcast network
-10.0.0.0/8        REJECT Domain MX in RFC 1918 private network
-169.254.0.0/16    REJECT Domain MX in link local network
-172.16.0.0/12     REJECT Domain MX in RFC 1918 private network
-192.0.2.0/24      REJECT Domain MX in TEST-NET network
-192.168.0.0/16    REJECT Domain MX in RFC 1918 private network
-224.0.0.0/4       REJECT Domain MX in class D multicast network
-240.0.0.0/5       REJECT Domain MX in class E reserved network
-248.0.0.0/5       REJECT Domain MX in reserved network
diff --git a/templates/misc/configfiles/ubuntu_hardy/powerdns/etc_powerdns_pdns-froxlor.conf b/templates/misc/configfiles/ubuntu_hardy/powerdns/etc_powerdns_pdns-froxlor.conf
deleted file mode 100644
index 5e12377d..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/powerdns/etc_powerdns_pdns-froxlor.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-allow-axfr-ips=<NAMESERVERS>
-#local-ipv6=YOUR_IPv6_(if_any)
-bind-config=<BIND_CONFIG_PATH>named.conf
-bind-check-interval=180
-log-dns-details=yes
-local-address=<SERVERIP>,127.0.0.1
-
diff --git a/templates/misc/configfiles/ubuntu_hardy/powerdns/etc_powerdns_pdns.conf b/templates/misc/configfiles/ubuntu_hardy/powerdns/etc_powerdns_pdns.conf
deleted file mode 100644
index 56d4b2a0..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/powerdns/etc_powerdns_pdns.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-allow-recursion=127.0.0.1
-config-dir=/etc/powerdns
-daemon=yes
-guardian=yes
-launch=bind
-lazy-recursion=yes
-local-port=53
-master=yes
-module-dir=/usr/lib/powerdns
-setgid=pdns
-setuid=pdns
-socket-dir=/var/run
-version-string=powerdns
-bind-config=<BIND_CONFIG_PATH>named.conf
-bind-check-interval=300
-include=/etc/powerdns/pdns_froxlor.conf
-
diff --git a/templates/misc/configfiles/ubuntu_hardy/proftpd/etc_proftpd_modules.conf b/templates/misc/configfiles/ubuntu_hardy/proftpd/etc_proftpd_modules.conf
deleted file mode 100644
index 26ea26d4..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/proftpd/etc_proftpd_modules.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# This file is used to manage DSO modules and features.
-#
-
-# This is the directory where DSO modules resides
-
-ModulePath /usr/lib/proftpd
-
-# Allow only user root to load and unload modules, but allow everyone
-# to see which modules have been loaded
-
-ModuleControlsACLs insmod,rmmod allow user root
-ModuleControlsACLs lsmod allow user *
-
-#LoadModule mod_ctrls_admin.c
-LoadModule mod_tls.c
-LoadModule mod_sql.c
-#LoadModule mod_ldap.c
-LoadModule mod_sql_mysql.c
-#LoadModule mod_sql_postgres.c
-LoadModule mod_quotatab.c
-#LoadModule mod_quotatab_file.c
-#LoadModule mod_quotatab_ldap.c
-LoadModule mod_quotatab_sql.c
-#LoadModule mod_radius.c
-LoadModule mod_wrap.c
-LoadModule mod_rewrite.c
-
-# keep this module the last one
-LoadModule mod_ifsession.c
-
-<IfModule mod_delay.c>
-  DelayEngine off
-</IfModule>
diff --git a/templates/misc/configfiles/ubuntu_hardy/proftpd/etc_proftpd_proftpd.conf b/templates/misc/configfiles/ubuntu_hardy/proftpd/etc_proftpd_proftpd.conf
deleted file mode 100644
index 60fe5572..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/proftpd/etc_proftpd_proftpd.conf
+++ /dev/null
@@ -1,79 +0,0 @@
-Include /etc/proftpd/modules.conf
-
-ServerName                      "<SERVERNAME> FTP Server"
-ServerType                      standalone
-DeferWelcome                    off
-
-MultilineRFC2228                on
-DefaultServer                   on
-ShowSymlinks                    on
-AllowOverwrite                  on
-
-TimeoutNoTransfer               600
-TimeoutStalled                  600
-TimeoutIdle                     1200
-
-DisplayLogin                    welcome.msg
-DisplayChdir					.message
-ListOptions                     "-l"
-
-DenyFilter                      \*.*/
-
-Port                            21
-MaxInstances                    30
-UseIPv6                         off
-
-TransferLog						/var/log/proftpd/xferlog
-SystemLog						/var/log/proftpd/proftpd.log
-
-# Allow up- and downloads to be continued
-AllowRetrieveRestart	On
-AllowStoreRestart		On
-
-# make proftpd faster / do not perform ident and reverse dns lookup
-UseReverseDNS off
-IdentLookups off 
-
-# Set the user and group that the server normally runs at.
-User                            nobody
-Group                           nogroup
-
-<Directory /*>
-# Umask 022 is a good standard umask to prevent new files and dirs
-# (second parm) from being group and world writable.
-  Umask                         022  022
-# Normally, we want files to be overwriteable.
-  AllowOverwrite                on
-</Directory>
-
-DefaultRoot ~
-RequireValidShell off
-
-AuthOrder mod_sql.c
-
-SQLAuthTypes Crypt
-SQLAuthenticate users* groups*
-SQLConnectInfo <SQL_DB>@<SQL_HOST> <SQL_UNPRIVILEGED_USER> <SQL_UNPRIVILEGED_PASSWORD>
-SQLUserInfo ftp_users username password uid gid homedir shell
-SQLGroupInfo ftp_groups groupname gid members
-SQLUserWhereClause "login_enabled = 'y'"
-
-SQLLog PASS login
-SQLNamedQuery login UPDATE "last_login=now(), login_count=login_count+1 WHERE username='%u'" ftp_users
-
-SQLLog RETR download
-SQLNamedQuery download UPDATE "down_count=down_count+1, down_bytes=down_bytes+%b WHERE username='%u'" ftp_users
-
-SQLLog STOR upload
-SQLNamedQuery upload UPDATE "up_count=up_count+1, up_bytes=up_bytes+%b WHERE username='%u'" ftp_users
-
-QuotaEngine on
-QuotaShowQuotas on
-QuotaDisplayUnits Mb
-QuotaLock /var/lock/ftpd.quotatab.lock
-QuotaLimitTable sql:/get-quota-limit
-QuotaTallyTable sql:/get-quota-tally/update-quota-tally/insert-quota-tally
-SQLNamedQuery get-quota-limit SELECT "ftp_users.username AS name, ftp_quotalimits.quota_type, ftp_quotalimits.per_session, ftp_quotalimits.limit_type, panel_customers.diskspace*1024 AS bytes_in_avail, ftp_quotalimits.bytes_out_avail, ftp_quotalimits.bytes_xfer_avail, ftp_quotalimits.files_in_avail, ftp_quotalimits.files_out_avail, ftp_quotalimits.files_xfer_avail FROM ftp_users, ftp_quotalimits, panel_customers WHERE ftp_users.username = '%{0}' AND panel_customers.loginname = SUBSTRING_INDEX('%{0}', 'ftp', 1) AND quota_type ='%{1}'"
-SQLNamedQuery get-quota-tally SELECT "name, quota_type, bytes_in_used,bytes_out_used, bytes_xfer_used, files_in_used, files_out_used,files_xfer_used FROM ftp_quotatallies WHERE name = '%{0}' AND quota_type = '%{1}'"
-SQLNamedQuery update-quota-tally UPDATE "bytes_in_used = bytes_in_used + %{0}, bytes_out_used = bytes_out_used + %{1}, bytes_xfer_used = bytes_xfer_used + %{2}, files_in_used = files_in_used + %{3}, files_out_used= files_out_used + %{4}, files_xfer_used = files_xfer_used + %{5} WHERE name= '%{6}' AND quota_type = '%{7}'" ftp_quotatallies
-SQLNamedQuery insert-quota-tally INSERT "%{0}, %{1}, %{2}, %{3}, %{4},%{5}, %{6}, %{7}" ftp_quotatallies
diff --git a/templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_default_pure-ftpd-common b/templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_default_pure-ftpd-common
deleted file mode 100644
index b2653904..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_default_pure-ftpd-common
+++ /dev/null
@@ -1,5 +0,0 @@
-STANDALONE_OR_INETD=standalone
-VIRTUALCHROOT=false
-UPLOADSCRIPT=
-UPLOADUID=
-UPLOADGID=
diff --git a/templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_conf_Bind b/templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_conf_Bind
deleted file mode 100644
index aabe6ec3..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_conf_Bind
+++ /dev/null
@@ -1 +0,0 @@
-21
diff --git a/templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_conf_ChrootEveryone b/templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_conf_ChrootEveryone
deleted file mode 100644
index 7cfab5b0..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_conf_ChrootEveryone
+++ /dev/null
@@ -1 +0,0 @@
-yes
diff --git a/templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_conf_CustomerProof b/templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_conf_CustomerProof
deleted file mode 100644
index d00491fd..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_conf_CustomerProof
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_conf_MaxIdleTime b/templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_conf_MaxIdleTime
deleted file mode 100644
index 60d3b2f4..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_conf_MaxIdleTime
+++ /dev/null
@@ -1 +0,0 @@
-15
diff --git a/templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_conf_MinUID b/templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_conf_MinUID
deleted file mode 100644
index 83b33d23..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_conf_MinUID
+++ /dev/null
@@ -1 +0,0 @@
-1000
diff --git a/templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_conf_MySQLConfigFile b/templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_conf_MySQLConfigFile
deleted file mode 100644
index be85bafe..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_conf_MySQLConfigFile
+++ /dev/null
@@ -1 +0,0 @@
-/etc/pure-ftpd/db/mysql.conf
diff --git a/templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_conf_NoAnonymous b/templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_conf_NoAnonymous
deleted file mode 100644
index 7cfab5b0..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_conf_NoAnonymous
+++ /dev/null
@@ -1 +0,0 @@
-yes
diff --git a/templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_conf_PAMAuthentication b/templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_conf_PAMAuthentication
deleted file mode 100644
index 7ecb56eb..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_conf_PAMAuthentication
+++ /dev/null
@@ -1 +0,0 @@
-no
diff --git a/templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_db_mysql.conf b/templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_db_mysql.conf
deleted file mode 100644
index 22ecee5c..00000000
--- a/templates/misc/configfiles/ubuntu_hardy/pure-ftpd/etc_pure-ftpd_db_mysql.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-MYSQLServer	<SQL_HOST>
-MYSQLUser       <SQL_UNPRIVILEGED_USER>
-MYSQLPassword   <SQL_UNPRIVILEGED_PASSWORD>
-MYSQLDatabase   <SQL_DB>
-MYSQLCrypt      any
-
-MYSQLGetPW      SELECT password FROM ftp_users WHERE username="\L" AND login_enabled="y"
-MYSQLGetUID     SELECT uid FROM ftp_users WHERE username="\L" AND login_enabled="y"
-MYSQLGetGID     SELECT gid FROM ftp_users WHERE username="\L" AND login_enabled="y"
-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)