auto-format all files; add table-definitions to test-bootstrap file

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>

lib/configfiles/gentoo.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <froxlor>
-	<distribution name="Gentoo" version="2.2" defaulteditor="/usr/bin/nano">
+	<distribution name="Gentoo" version="2.2"
+		defaulteditor="/usr/bin/nano">
 		<services>
 			<!-- HTTP -->
 			<service type="http" title="{{lng.admin.configfiles.http}}">
@@ -915,8 +916,8 @@ include-dir=/etc/powerdns/froxlor/
 						</content>
 					</file>
 					<command><![CDATA[mkdir -p /etc/powerdns/froxlor/]]></command>
-					<file name="/etc/powerdns/froxlor/pdns_froxlor.conf" chown="root:root"
-						chmod="600">
+					<file name="/etc/powerdns/froxlor/pdns_froxlor.conf"
+						chown="root:root" chmod="600">
 						<content><![CDATA[
 # mysql-settings / you need to create the power-dns database for yourself!
 launch=gmysql
@@ -931,7 +932,8 @@ gmysql-password=
 					</file>
 					<command><![CDATA[/etc/init.d/pdns restart]]></command>
 				</daemon>
-				<daemon name="powerdns_bind" title="PowerDNS via bind-backend">
+				<daemon name="powerdns_bind"
+					title="PowerDNS via bind-backend">
 					<install><![CDATA[emerge net-dns/pdns]]></install>
 					<file name="/etc/powerdns/pdns.conf" backup="true" chmod="600">
 						<content><![CDATA[
@@ -1458,8 +1460,8 @@ include-dir=/etc/powerdns/froxlor/
 						</content>
 					</file>
 					<command><![CDATA[mkdir -p /etc/powerdns/froxlor/]]></command>
-					<file name="/etc/powerdns/froxlor/pdns_froxlor.conf" chown="root:root"
-						chmod="600">
+					<file name="/etc/powerdns/froxlor/pdns_froxlor.conf"
+						chown="root:root" chmod="600">
 						<content><![CDATA[
 #local-ipv6=YOUR_IPv6_(if_any)
 bind-config=<BIND_CONFIG_PATH>named.conf
@@ -1495,8 +1497,8 @@ bind-check-interval=180
 						<command><![CDATA[chmod 0750  {{settings.system.vmail_homedir}}]]></command>
 					</commands>
 					<files index="0">
-						<file name="/etc/postfix/mysql-virtual_alias_maps.cf" chown="root:postfix"
-							chmod="0640">
+						<file name="/etc/postfix/mysql-virtual_alias_maps.cf"
+							chown="root:postfix" chmod="0640">
 							<content><![CDATA[
 user = <SQL_UNPRIVILEGED_USER>
 password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -1540,8 +1542,8 @@ query = SELECT DISTINCT username FROM mail_users WHERE email in ((SELECT mail_vi
 ]]>
 							</content>
 						</file>
-						<file name="/etc/postfix/mysql-virtual_uid_maps.cf" chown="root:postfix"
-							chmod="0640">
+						<file name="/etc/postfix/mysql-virtual_uid_maps.cf"
+							chown="root:postfix" chmod="0640">
 							<content><![CDATA[
 user = <SQL_UNPRIVILEGED_USER>
 password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -1552,8 +1554,8 @@ query = SELECT uid FROM mail_users WHERE email = '%s'
 ]]>
 							</content>
 						</file>
-						<file name="/etc/postfix/mysql-virtual_gid_maps.cf" chown="root:postfix"
-							chmod="0640">
+						<file name="/etc/postfix/mysql-virtual_gid_maps.cf"
+							chown="root:postfix" chmod="0640">
 							<content><![CDATA[
 user = <SQL_UNPRIVILEGED_USER>
 password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -1602,8 +1604,8 @@ root:               root@<SERVERNAME>
 					</include>
 					<include>//service[@type='smtp']/general/commands[@index=2]
 					</include>
-					<file name="/etc/postfix/main.cf" chown="root:root" chmod="0644"
-						backup="true">
+					<file name="/etc/postfix/main.cf" chown="root:root"
+						chmod="0644" backup="true">
 						<content><![CDATA[
 # Postfix programs paths settings
 command_directory = /usr/sbin
@@ -1727,8 +1729,8 @@ debugger_command =
 						</content>
 					</file>
 					<include>//service[@type='smtp']/general/files[@index=0]</include>
-					<file name="/etc/postfix/master.cf" chown="root:root" chmod="0644"
-						backup="true" mode="append">
+					<file name="/etc/postfix/master.cf" chown="root:root"
+						chmod="0644" backup="true" mode="append">
 						<content><![CDATA[
 # Add this lines to be able to use dovecot as delivery agent
 # Dovecot LDA
@@ -1750,8 +1752,8 @@ dovecot	  unix	-	n	n	-	-	pipe
 					</include>
 					<include>//service[@type='smtp']/general/commands[@index=2]
 					</include>
-					<file name="/etc/postfix/main.cf" chown="root:root" chmod="0644"
-						backup="true">
+					<file name="/etc/postfix/main.cf" chown="root:root"
+						chmod="0644" backup="true">
 						<content><![CDATA[
 # Postfix programs paths settings
 command_directory = /usr/sbin
@@ -1880,8 +1882,8 @@ debugger_command =
 						</content>
 					</file>
 					<include>//service[@type='smtp']/general/files[@index=0]</include>
-					<file name="/etc/postfix/master.cf" chown="root:root" chmod="0644"
-						backup="true" mode="append">
+					<file name="/etc/postfix/master.cf" chown="root:root"
+						chmod="0644" backup="true" mode="append">
 						<content><![CDATA[
 # Add this lines to be able to use dovecot as delivery agent
 # Dovecot LDA
@@ -1903,8 +1905,8 @@ dovecot	  unix	-	n	n	-	-	pipe
 					</include>
 					<include>//service[@type='smtp']/general/commands[@index=2]
 					</include>
-					<file name="/etc/postfix/main.cf" chown="root:root" chmod="0644"
-						backup="true">
+					<file name="/etc/postfix/main.cf" chown="root:root"
+						chmod="0644" backup="true">
 						<content><![CDATA[
 # Postfix programs paths settings
 command_directory = /usr/sbin
@@ -2000,7 +2002,8 @@ debugger_command =
 						</content>
 					</file>
 					<include>//service[@type='smtp']/general/files[@index=0]</include>
-					<file name="/etc/sasl2/smtpd.conf" chown="root:root" chmod="0600">
+					<file name="/etc/sasl2/smtpd.conf" chown="root:root"
+						chmod="0600">
 						<content><![CDATA[
 pwcheck_method: auxprop
 auxprop_plugin: sql
@@ -2024,7 +2027,8 @@ sql_select: SELECT password_enc FROM mail_users WHERE username='%u@%r' OR email=
 			<!-- IMAP/POP3 services -->
 			<service type="mail" title="{{lng.admin.configfiles.mail}}">
 				<!-- Dovecot -->
-				<daemon name="dovecot" version="2" title="Dovecot" default="true">
+				<daemon name="dovecot" version="2" title="Dovecot"
+					default="true">
 					<command><![CDATA[echo "net-mail/dovecot mysql managesieve sieve" >> /etc/portage/package.use]]></command>
 					<install><![CDATA[emerge net-mail/dovecot]]></install>
 					<file name="/etc/dovecot/dovecot.conf" chown="root:root"
@@ -2132,8 +2136,8 @@ protocol lda {
 ]]>
 						</content>
 					</file>
-					<file name="/etc/dovecot/dovecot-sql.conf.ext" chown="root:root"
-						chmod="0600" backup="true">
+					<file name="/etc/dovecot/dovecot-sql.conf.ext"
+						chown="root:root" chmod="0600" backup="true">
 						<content><![CDATA[
 driver = mysql
 connect = host=<SQL_HOST> dbname=<SQL_DB> user=<SQL_UNPRIVILEGED_USER> password=<SQL_UNPRIVILEGED_PASSWORD>
@@ -2144,8 +2148,8 @@ iterate_query = "SELECT username AS user FROM mail_users WHERE (imap = 1 OR pop3
 ]]>
 						</content>
 					</file>
-					<file name="/etc/dovecot/conf.d/20-managesieve.conf" chown="root:root"
-						chmod="0644" backup="true">
+					<file name="/etc/dovecot/conf.d/20-managesieve.conf"
+						chown="root:root" chmod="0644" backup="true">
 						<content><![CDATA[
 ##
 ## ManageSieve specific settings
@@ -2226,8 +2230,8 @@ protocol sieve {
 ]]>
 						</content>
 					</file>
-					<file name="/etc/dovecot/conf.d/90-sieve.conf" chown="root:root"
-						chmod="0644" backup="true">
+					<file name="/etc/dovecot/conf.d/90-sieve.conf"
+						chown="root:root" chmod="0644" backup="true">
 						<content><![CDATA[
 ##
 ## Settings for the Sieve interpreter
@@ -2496,8 +2500,8 @@ MYSQL_AUXOPTIONS_FIELD CONCAT("allowimap=",imap,",allowpop3=",pop3)
 ]]>
 						</content>
 					</file>
-					<file name="/etc/courier-imap/pop3d" chown="root:0" chmod="0600"
-						backup="true">
+					<file name="/etc/courier-imap/pop3d" chown="root:0"
+						chmod="0600" backup="true">
 						<content><![CDATA[
 ##VERSION: $Id: pop3d.dist.in,v 1.11 2004/10/30 15:39:38 mrsam Exp $
 #
@@ -2629,8 +2633,8 @@ PRERUN=
 ]]>
 						</content>
 					</file>
-					<file name="/etc/courier-imap/imapd" chown="root:0" chmod="0600"
-						backup="true">
+					<file name="/etc/courier-imap/imapd" chown="root:0"
+						chmod="0600" backup="true">
 						<content><![CDATA[
 ##VERSION: $Id: imapd.dist.in,v 1.32 2004/11/25 04:57:04 mrsam Exp $
 #
@@ -3011,8 +3015,8 @@ PRERUN=
 ]]>
 						</content>
 					</file>
-					<file name="/etc/courier-imap/pop3d-ssl" chown="root:0" chmod="0600"
-						backup="true">
+					<file name="/etc/courier-imap/pop3d-ssl" chown="root:0"
+						chmod="0600" backup="true">
 						<content><![CDATA[
 ##VERSION: $Id: pop3d-ssl.dist.in,v 1.12 2004/10/21 00:45:35 mrsam Exp $
 #
@@ -3203,8 +3207,8 @@ MAILDIRPATH=.maildir
 ]]>
 						</content>
 					</file>
-					<file name="/etc/courier-imap/imapd-ssl" chown="root:0" chmod="0600"
-						backup="true">
+					<file name="/etc/courier-imap/imapd-ssl" chown="root:0"
+						chmod="0600" backup="true">
 						<content><![CDATA[
 ##VERSION: $Id: imapd-ssl.dist.in,v 1.11 2004/10/21 00:45:35 mrsam Exp $
 #
@@ -3422,7 +3426,8 @@ MAILDIRPATH=.maildir
 				<daemon name="proftpd" title="ProFTPd" default="true">
 					<command><![CDATA[echo "net-ftp/proftpd mysql" >> /etc/portage/package.use]]></command>
 					<install><![CDATA[emerge net-ftp/proftpd]]></install>
-					<file name="/etc/proftpd/create-cert.sh" chown="root:0" chmod="0700">
+					<file name="/etc/proftpd/create-cert.sh" chown="root:0"
+						chmod="0700">
 						<content><![CDATA[#!/bin/bash
 [ -f /etc/ssl/certs/proftpd.crt ] || openssl req -new -x509 -newkey rsa:4096 -days 3650 -nodes -out /etc/ssl/certs/proftpd.crt -keyout /etc/ssl/private/proftpd.key -subj "/C=US/ST=Some-State/O=Internet Widgits Pty Ltd/CN=<SERVERNAME>"
 [ -f /etc/ssl/certs/proftpd_ec.crt ] || openssl req -new -x509 -nodes -newkey ec:<(openssl ecparam -name secp521r1) -keyout /etc/ssl/private/proftpd_ec.key -out /etc/ssl/certs/proftpd_ec.crt -days 3650 -subj "/C=US/ST=Some-State/O=Internet Widgits Pty Ltd/CN=<SERVERNAME>"
@@ -3434,8 +3439,8 @@ chmod 0600 /etc/ssl/private/proftpd.key /etc/ssl/private/proftpd_ec.key
 						<command><![CDATA[/etc/proftpd/create-cert.sh]]></command>
 						<command><![CDATA[rm -f /etc/proftpd/create-cert.sh]]></command>
 					</commands>
-					<file name="/etc/proftpd/proftpd.conf" chown="root:0" chmod="0600"
-						backup="true">
+					<file name="/etc/proftpd/proftpd.conf" chown="root:0"
+						chmod="0600" backup="true">
 						<content><![CDATA[
 # Server settings
 ServerName				"<SERVERNAME> FTP Server"
@@ -3582,8 +3587,8 @@ MISC_OTHER="-A -x -j -Z"
 ]]>
 						</content>
 					</file>
-					<file name="/etc/pureftpd-mysql.conf" chown="root:0" chmod="0600"
-						backup="true">
+					<file name="/etc/pureftpd-mysql.conf" chown="root:0"
+						chmod="0600" backup="true">
 						<content><![CDATA[
 MYSQLServer     <SQL_HOST>
 #MYSQLPort       3306
@@ -3607,8 +3612,8 @@ MySQLGetQTASZ   SELECT panel_customers.diskspace/1024 AS QuotaSize FROM panel_cu
 				<daemon name="vsftpd" title="vsftpd">
 					<command><![CDATA[echo "net-ftp/vsftpd pam" >> /etc/portage/package.use]]></command>
 					<install><![CDATA[emerge net-ftp/vsftpd sys-auth/pam_mysql]]></install>
-					<file name="/etc/vsftpd/vsftpd.conf" chown="root:root" chmod="0644"
-						backup="true">
+					<file name="/etc/vsftpd/vsftpd.conf" chown="root:root"
+						chmod="0644" backup="true">
 						<content><![CDATA[
 listen=YES
 #listen_ipv6=YES
@@ -3680,7 +3685,8 @@ account     required    pam_mysql.so user=<SQL_UNPRIVILEGED_USER> passwd=<SQL_UN
 			<!-- System tools/services -->
 			<service type="system" title="{{lng.admin.configfiles.etc}}">
 				<!-- Cronjob -->
-				<daemon name="cron" title="Cronjob for froxlor" mandatory="true">
+				<daemon name="cron" title="Cronjob for froxlor"
+					mandatory="true">
 					<file name="/etc/cron.d/froxlor" chown="root:0" chmod="0640">
 						<content><![CDATA[
 #
@@ -3699,17 +3705,19 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
 					<command><![CDATA[{{settings.system.crondreload}}]]></command>
 				</daemon>
 				<!-- AWstats -->
-				<daemon name="awstats" title="Awstats (webalizer alternative)">
+				<daemon name="awstats"
+					title="Awstats (webalizer alternative)">
 					<install><![CDATA[emerge www-misc/awstats]]></install>
 					<command><![CDATA[sed -i.bak 's/^DirData/# DirData/' {{settings.system.awstats_conf}}/awstats.model.conf]]></command>
 					<command><![CDATA[sed -i.bak 's|^\\(DirIcons=\\).*$|\\1\\"/awstats-icon\\"|' {{settings.system.awstats_conf}}/awstats.model.conf]]></command>
 					<command><![CDATA[rm /etc/cron.d/awstats]]></command>
 				</daemon>
 				<!-- libnss-mysql -->
-				<daemon name="libnss" title="libnss-mysql (required for FCGID/php-fpm/mpm-itk)">
+				<daemon name="libnss"
+					title="libnss-mysql (required for FCGID/php-fpm/mpm-itk)">
 					<install><![CDATA[emerge sys-auth/libnss-mysql]]></install>
-					<file name="/etc/libnss-mysql.cfg" chown="root:root" chmod="0600"
-						backup="true">
+					<file name="/etc/libnss-mysql.cfg" chown="root:root"
+						chmod="0600" backup="true">
 						<content><![CDATA[
 getpwnam    SELECT username,'x',uid,gid,'Froxlor Customer',homedir,shell \
             FROM ftp_users \
@@ -3804,7 +3812,8 @@ aliases:     files
 				<!-- Logrotate -->
 				<daemon name="logrotate" title="Logrotate">
 					<install><![CDATA[emerge app-admin/logrotate]]></install>
-					<file name="/etc/logrotate.d/froxlor" chown="root:root" chmod="0644">
+					<file name="/etc/logrotate.d/froxlor" chown="root:root"
+						chmod="0644">
 						<content><![CDATA[
 #
 # Froxlor logrotate snipet
@@ -3858,12 +3867,13 @@ aliases:     files
 							<content><![CDATA[# remove "-D PHP5" from /etc/conf.d/apache2]]></content>
 						</command>
 					</commands>
-					<!-- instead of just restarting apache, we let the cronjob do all the
+					<!-- instead of just restarting apache, we let the cronjob do all the 
 						dirty work -->
 					<command><![CDATA[php {{const.\Froxlor\Froxlor::getInstallDir()}}/scripts/froxlor_master_cronjob.php --force]]></command>
 				</daemon>
 				<!-- PHP-FPM -->
-				<daemon name="php-fpm" title="PHP-FPM (alternative to mod_php)">
+				<daemon name="php-fpm"
+					title="PHP-FPM (alternative to mod_php)">
 					<command><![CDATA[echo "dev-lang/php fpm" >> /etc/portage/package.use]]></command>
 					<install><![CDATA[emerge dev-lang/php sys-auth/libnss-mysql]]></install>
 					<commands index="1">
@@ -3896,7 +3906,7 @@ aliases:     files
 						</visibility>
 						<command><![CDATA[# remove "-D PHP5" from /etc/conf.d/apache2]]></command>
 					</commands>
-					<!-- instead of just restarting apache, we let the cronjob do all the
+					<!-- instead of just restarting apache, we let the cronjob do all the 
 						dirty work -->
 					<command><![CDATA[php {{const.\Froxlor\Froxlor::getInstallDir()}}/scripts/froxlor_master_cronjob.php --force]]></command>
 				</daemon>

lib/configfiles/jessie.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <froxlor>
-	<distribution name="Debian" codename="Jessie" version="8.x" defaulteditor="/usr/bin/nano">
+	<distribution name="Debian" codename="Jessie"
+		version="8.x" defaulteditor="/usr/bin/nano">
 		<services>
 			<!-- HTTP -->
 			<service type="http" title="{{lng.admin.configfiles.http}}">
@@ -43,7 +44,8 @@
 					</commands>
 				</general>
 				<!-- HTTP Apache -->
-				<daemon name="apache" version="2.4" title="Apache 2.4" default="true">
+				<daemon name="apache" version="2.4" title="Apache 2.4"
+					default="true">
 					<install><![CDATA[apt-get install apache2]]></install>
 					<include>//service[@type='http']/general/commands</include>
 					<command><![CDATA[a2dismod userdir]]></command>
@@ -904,8 +906,8 @@ include-dir=/etc/powerdns/froxlor/
 						</content>
 					</file>
 					<command><![CDATA[mkdir -p /etc/powerdns/froxlor/]]></command>
-					<file name="/etc/powerdns/froxlor/pdns_froxlor.conf" chown="root:root"
-						chmod="600">
+					<file name="/etc/powerdns/froxlor/pdns_froxlor.conf"
+						chown="root:root" chmod="600">
 						<content><![CDATA[
 # mysql-settings / you need to create the power-dns database for yourself!
 launch=gmysql
@@ -920,7 +922,8 @@ gmysql-password=
 					</file>
 					<command><![CDATA[/etc/init.d/pdns restart]]></command>
 				</daemon>
-				<daemon name="powerdns_bind" title="PowerDNS via bind-backend">
+				<daemon name="powerdns_bind"
+					title="PowerDNS via bind-backend">
 					<install><![CDATA[apt-get install pdns-server]]></install>
 					<file name="/etc/powerdns/pdns.conf" backup="true" chmod="600">
 						<content><![CDATA[
@@ -1447,8 +1450,8 @@ include-dir=/etc/powerdns/froxlor/
 						</content>
 					</file>
 					<command><![CDATA[mkdir -p /etc/powerdns/froxlor/]]></command>
-					<file name="/etc/powerdns/froxlor/pdns_froxlor.conf" chown="root:root"
-						chmod="600">
+					<file name="/etc/powerdns/froxlor/pdns_froxlor.conf"
+						chown="root:root" chmod="600">
 						<content><![CDATA[
 # Bind backend configuration
 
@@ -1494,8 +1497,8 @@ bind-check-interval=180
 						<command><![CDATA[chmod 0750  {{settings.system.vmail_homedir}}]]></command>
 					</commands>
 					<files index="0">
-						<file name="/etc/postfix/mysql-virtual_alias_maps.cf" chown="root:postfix"
-							chmod="0640">
+						<file name="/etc/postfix/mysql-virtual_alias_maps.cf"
+							chown="root:postfix" chmod="0640">
 							<content><![CDATA[
 user = <SQL_UNPRIVILEGED_USER>
 password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -1539,8 +1542,8 @@ query = SELECT DISTINCT username FROM mail_users WHERE email in ((SELECT mail_vi
 ]]>
 							</content>
 						</file>
-						<file name="/etc/postfix/mysql-virtual_uid_maps.cf" chown="root:postfix"
-							chmod="0640">
+						<file name="/etc/postfix/mysql-virtual_uid_maps.cf"
+							chown="root:postfix" chmod="0640">
 							<content><![CDATA[
 user = <SQL_UNPRIVILEGED_USER>
 password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -1551,8 +1554,8 @@ query = SELECT uid FROM mail_users WHERE email = '%s'
 ]]>
 							</content>
 						</file>
-						<file name="/etc/postfix/mysql-virtual_gid_maps.cf" chown="root:postfix"
-							chmod="0640">
+						<file name="/etc/postfix/mysql-virtual_gid_maps.cf"
+							chown="root:postfix" chmod="0640">
 							<content><![CDATA[
 user = <SQL_UNPRIVILEGED_USER>
 password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -1599,8 +1602,8 @@ root:               root@<SERVERNAME>
 					</include>
 					<include>//service[@type='smtp']/general/commands[@index=2]
 					</include>
-					<file name="/etc/postfix/main.cf" chown="root:root" chmod="0644"
-						backup="true">
+					<file name="/etc/postfix/main.cf" chown="root:root"
+						chmod="0644" backup="true">
 						<content><![CDATA[
 # Global Postfix configuration file. This file lists only a subset
 # of all parameters. For the syntax, and for a complete parameter
@@ -2325,8 +2328,8 @@ virtual_mailbox_limit = 0
 						</content>
 					</file>
 					<include>//service[@type='smtp']/general/files[@index=0]</include>
-					<file name="/etc/postfix/master.cf" chown="root:root" chmod="0644"
-						backup="true">
+					<file name="/etc/postfix/master.cf" chown="root:root"
+						chmod="0644" backup="true">
 						<content><![CDATA[
 #
 # Postfix master process configuration file.  For details on the format
@@ -2577,8 +2580,8 @@ dict {
 ]]>
 							</content>
 						</file>
-						<file name="/etc/dovecot/dovecot-sql.conf.ext" chown="root:root"
-							chmod="0600" backup="true">
+						<file name="/etc/dovecot/dovecot-sql.conf.ext"
+							chown="root:root" chmod="0600" backup="true">
 							<content><![CDATA[
 # This file is commonly accessed via passdb {} or userdb {} section in
 # conf.d/auth-sql.conf.ext
@@ -3237,8 +3240,8 @@ mail_access_groups = vmail
 ]]>
 							</content>
 						</file>
-						<file name="/etc/dovecot/conf.d/10-master.conf" chown="root:0"
-							chmod="0644" backup="true">
+						<file name="/etc/dovecot/conf.d/10-master.conf"
+							chown="root:0" chmod="0644" backup="true">
 							<content><![CDATA[
 #default_process_limit = 100
 #default_client_limit = 1000
@@ -3492,8 +3495,8 @@ protocol imap {
 ]]>
 							</content>
 						</file>
-						<file name="/etc/dovecot/conf.d/20-managesieve.conf" chown="root:0"
-							chmod="0644" backup="true">
+						<file name="/etc/dovecot/conf.d/20-managesieve.conf"
+							chown="root:0" chmod="0644" backup="true">
 							<content><![CDATA[
 ##
 ## ManageSieve specific settings
@@ -3795,8 +3798,8 @@ plugin {
 					</commands>
 				</general>
 				<!-- Dovecot with postfix -->
-				<daemon name="dovecot_postfix" version="2" title="Dovecot with postfix"
-					default="true">
+				<daemon name="dovecot_postfix" version="2"
+					title="Dovecot with postfix" default="true">
 					<include>//service[@type='mail']/general/installs[@index=1]
 					</include>
 					<include>//service[@type='mail']/general/files[@index=1]
@@ -3805,7 +3808,8 @@ plugin {
 					</include>
 				</daemon>
 				<!-- Dovecot with exim4 -->
-				<daemon name="dovecot_exim4" version="2" title="Dovecot with exim4">
+				<daemon name="dovecot_exim4" version="2"
+					title="Dovecot with exim4">
 					<include>//service[@type='mail']/general/installs[@index=1]
 					</include>
 					<include>//service[@type='mail']/general/files[@index=1]
@@ -3819,7 +3823,8 @@ plugin {
 				<!-- Proftpd -->
 				<daemon name="proftpd" title="ProFTPd" default="true">
 					<install><![CDATA[apt-get install proftpd-basic proftpd-mod-mysql]]></install>
-					<file name="/etc/proftpd/create-cert.sh" chown="root:0" chmod="0700">
+					<file name="/etc/proftpd/create-cert.sh" chown="root:0"
+						chmod="0700">
 						<content><![CDATA[#!/bin/bash
 [ -f /etc/ssl/certs/proftpd.crt ] || openssl req -new -x509 -newkey rsa:4096 -days 3650 -nodes -out /etc/ssl/certs/proftpd.crt -keyout /etc/ssl/private/proftpd.key -subj "/C=US/ST=Some-State/O=Internet Widgits Pty Ltd/CN=<SERVERNAME>"
 [ -f /etc/ssl/certs/proftpd_ec.crt ] || openssl req -new -x509 -nodes -newkey ec:<(openssl ecparam -name secp521r1) -keyout /etc/ssl/private/proftpd_ec.key -out /etc/ssl/certs/proftpd_ec.crt -days 3650 -subj "/C=US/ST=Some-State/O=Internet Widgits Pty Ltd/CN=<SERVERNAME>"
@@ -3831,8 +3836,8 @@ chmod 0600 /etc/ssl/private/proftpd.key /etc/ssl/private/proftpd_ec.key
 						<command><![CDATA[/etc/proftpd/create-cert.sh]]></command>
 						<command><![CDATA[rm -f /etc/proftpd/create-cert.sh]]></command>
 					</commands>
-					<file name="/etc/proftpd/proftpd.conf" chown="root:0" chmod="0600"
-						backup="true">
+					<file name="/etc/proftpd/proftpd.conf" chown="root:0"
+						chmod="0600" backup="true">
 						<content><![CDATA[
 #
 # /etc/proftpd/proftpd.conf -- This is a basic ProFTPD configuration file.
@@ -4026,8 +4031,8 @@ Include /etc/proftpd/conf.d/
 ]]>
 						</content>
 					</file>
-					<file name="/etc/proftpd/modules.conf" chown="root:0" chmod="0644"
-						backup="true">
+					<file name="/etc/proftpd/modules.conf" chown="root:0"
+						chmod="0644" backup="true">
 						<content><![CDATA[
 #
 # This file is used to manage DSO modules and features.
@@ -4194,7 +4199,8 @@ SQLNamedQuery insert-quota-tally INSERT "%{0}, %{1}, %{2}, %{3}, %{4},%{5}, %{6}
 ]]>
 						</content>
 					</file>
-					<file name="/etc/proftpd/tls.conf" chown="root:root" chmod="0644" backup="true">
+					<file name="/etc/proftpd/tls.conf" chown="root:root"
+						chmod="0644" backup="true">
 						<content><![CDATA[
 <IfModule mod_tls.c>
 TLSEngine                               on
@@ -4226,14 +4232,15 @@ TLSVerifyClient                         off
 				<!-- Pureftpd -->
 				<daemon name="pureftpd" title="PureFTPd">
 					<install><![CDATA[apt-get install pure-ftpd-common pure-ftpd-mysql]]></install>
-					<file name="/etc/pure-ftpd/conf/MinUID" chown="root:0" chmod="0644">
+					<file name="/etc/pure-ftpd/conf/MinUID" chown="root:0"
+						chmod="0644">
 						<content><![CDATA[
 1000
 ]]>
 						</content>
 					</file>
-					<file name="/etc/pure-ftpd/conf/MySQLConfigFile" chown="root:0"
-						chmod="0644">
+					<file name="/etc/pure-ftpd/conf/MySQLConfigFile"
+						chown="root:0" chmod="0644">
 						<content><![CDATA[
 /etc/pure-ftpd/db/mysql.conf
 ]]>
@@ -4260,8 +4267,8 @@ yes
 ]]>
 						</content>
 					</file>
-					<file name="/etc/pure-ftpd/conf/PAMAuthentication" chown="root:0"
-						chmod="0644">
+					<file name="/etc/pure-ftpd/conf/PAMAuthentication"
+						chown="root:0" chmod="0644">
 						<content><![CDATA[
 no
 ]]>
@@ -4407,7 +4414,8 @@ MySQLGetQTASZ  SELECT panel_customers.diskspace/1024 AS QuotaSize FROM panel_cus
 ]]>
 						</content>
 					</file>
-					<file name="/etc/pure-ftpd/conf/Bind" chown="root:0" chmod="0644">
+					<file name="/etc/pure-ftpd/conf/Bind" chown="root:0"
+						chmod="0644">
 						<content><![CDATA[
 21
 ]]>
@@ -4451,7 +4459,8 @@ UPLOADGID=
 			<!-- System tools/services -->
 			<service type="system" title="{{lng.admin.configfiles.etc}}">
 				<!-- Cronjob -->
-				<daemon name="cron" title="Cronjob for froxlor" mandatory="true">
+				<daemon name="cron" title="Cronjob for froxlor"
+					mandatory="true">
 					<file name="/etc/cron.d/froxlor" chown="root:0" chmod="0640">
 						<content><![CDATA[
 #
@@ -4470,7 +4479,8 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 					<command><![CDATA[{{settings.system.crondreload}}]]></command>
 				</daemon>
 				<!-- AWstats -->
-				<daemon name="awstats" title="Awstats (webalizer alternative)">
+				<daemon name="awstats"
+					title="Awstats (webalizer alternative)">
 					<install><![CDATA[apt-get install awstats]]></install>
 					<command><![CDATA[cp /usr/share/awstats/tools/awstats_buildstaticpages.pl {{settings.system.awstats_path}}]]></command>
 					<command><![CDATA[mv {{settings.system.awstats_conf}}/awstats.conf {{settings.system.awstats_conf}}/awstats.model.conf]]></command>
@@ -4479,14 +4489,15 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 					<command><![CDATA[rm /etc/cron.d/awstats]]></command>
 				</daemon>
 				<!-- libnss-mysql -->
-				<daemon name="libnss" title="libnss-mysql (required for FCGID/php-fpm/mpm-itk)">
+				<daemon name="libnss"
+					title="libnss-mysql (required for FCGID/php-fpm/mpm-itk)">
 					<install><![CDATA[apt-get install nscd
 wget http://debian.froxlor.org/pool/main/libn/libnss-mysql-bg/libnss-mysql-bg_1.5-3+frx1_amd64.deb
 dpkg -i libnss-mysql-bg_1.5-3+frx1_amd64.deb
 rm libnss-mysql-bg_1.5-3+frx1_amd64.deb
 ]]></install>
-					<file name="/etc/libnss-mysql.cfg" chown="root:root" chmod="0600"
-						backup="true">
+					<file name="/etc/libnss-mysql.cfg" chown="root:root"
+						chmod="0600" backup="true">
 						<content><![CDATA[
 getpwnam    SELECT username,'x',uid,gid,'Froxlor Customer',homedir,shell \
             FROM ftp_users \
@@ -4584,7 +4595,8 @@ aliases:     files
 						<visibility mode="notisdir">/etc/insserv/overrides</visibility>
 						<content><![CDATA[mkdir -p /etc/insserv/overrides]]></content>
 					</command>
-					<file name="/etc/insserv/overrides/apache2" chown="root:root" chmod="0644">
+					<file name="/etc/insserv/overrides/apache2" chown="root:root"
+						chmod="0644">
 						<visibility mode="equals" value="apache2">{{settings.system.webserver}}</visibility>
 						<content><![CDATA[
 #!/bin/sh
@@ -4599,7 +4611,8 @@ aliases:     files
 ]]>
 						</content>
 					</file>
-					<file name="/etc/insserv/overrides/lighttpd" chown="root:root" chmod="0644">
+					<file name="/etc/insserv/overrides/lighttpd" chown="root:root"
+						chmod="0644">
 						<visibility mode="equals" value="lighttpd">{{settings.system.webserver}}</visibility>
 						<content><![CDATA[
 #!/bin/sh
@@ -4616,7 +4629,8 @@ aliases:     files
 ]]>
 						</content>
 					</file>
-					<file name="/etc/insserv/overrides/nginx" chown="root:root" chmod="0644">
+					<file name="/etc/insserv/overrides/nginx" chown="root:root"
+						chmod="0644">
 						<visibility mode="equals" value="nginx">{{settings.system.webserver}}</visibility>
 						<content><![CDATA[
 #!/bin/sh
@@ -4631,7 +4645,8 @@ aliases:     files
 ]]>
 						</content>
 					</file>
-					<file name="/etc/insserv/overrides/nscd" chown="root:root" chmod="0644">
+					<file name="/etc/insserv/overrides/nscd" chown="root:root"
+						chmod="0644">
 						<content><![CDATA[
 #!/bin/sh
 ### BEGIN INIT INFO
@@ -4647,7 +4662,8 @@ aliases:     files
 					</file>
 				</daemon>
 				<!-- libnss-extrausers -->
-				<daemon name="libnssextrausers" title="libnss-extrausers (alternative to libnss-mysql, required for FCGID/php-fpm/mpm-itk)">
+				<daemon name="libnssextrausers"
+					title="libnss-extrausers (alternative to libnss-mysql, required for FCGID/php-fpm/mpm-itk)">
 					<install><![CDATA[apt-get install nscd libnss-extrausers]]></install>
 					<commands index="1">
 						<command><![CDATA[mkdir -p /var/lib/extrausers]]></command>
@@ -4687,7 +4703,8 @@ aliases:     files
 				<!-- Logrotate -->
 				<daemon name="logrotate" title="Logrotate">
 					<install><![CDATA[apt-get install logrotate]]></install>
-					<file name="/etc/logrotate.d/froxlor" chown="root:root" chmod="0644">
+					<file name="/etc/logrotate.d/froxlor" chown="root:root"
+						chmod="0644">
 						<content><![CDATA[
 #
 # Froxlor logrotate snipet
@@ -4722,12 +4739,13 @@ aliases:     files
 						<command><![CDATA[mkdir -p {{settings.system.mod_fcgid_tmpdir}}]]></command>
 						<command><![CDATA[a2dismod php5]]></command>
 					</commands>
-					<!-- instead of just restarting apache, we let the cronjob do all the
+					<!-- instead of just restarting apache, we let the cronjob do all the 
 						dirty work -->
 					<command><![CDATA[php {{const.\Froxlor\Froxlor::getInstallDir()}}/scripts/froxlor_master_cronjob.php --force]]></command>
 				</daemon>
 				<!-- PHP-FPM -->
-				<daemon name="php-fpm" title="PHP-FPM (alternative to mod_php)">
+				<daemon name="php-fpm"
+					title="PHP-FPM (alternative to mod_php)">
 					<commands index="1">
 						<visibility mode="equals" value="apache2">{{settings.system.webserver}}
 						</visibility>
@@ -4765,7 +4783,7 @@ aliases:     files
 						</visibility>
 						<command><![CDATA[/etc/init.d/apache2 restart]]></command>
 					</commands>
-					<!-- instead of just restarting apache, we let the cronjob do all the
+					<!-- instead of just restarting apache, we let the cronjob do all the 
 						dirty work -->
 					<command><![CDATA[php {{const.\Froxlor\Froxlor::getInstallDir()}}/scripts/froxlor_master_cronjob.php --force]]></command>
 				</daemon>

lib/configfiles/precise.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <froxlor>
-	<distribution name="Ubuntu" codename="Precise" version="12.04" defaulteditor="/usr/bin/nano" deprecated="true">
+	<distribution name="Ubuntu" codename="Precise"
+		version="12.04" defaulteditor="/usr/bin/nano" deprecated="true">
 		<services>
 			<!-- HTTP -->
 			<service type="http" title="{{lng.admin.configfiles.http}}">
@@ -370,8 +371,8 @@ include-dir=/etc/powerdns/froxlor/
 						</content>
 					</file>
 					<command><![CDATA[mkdir -p /etc/powerdns/froxlor/]]></command>
-					<file name="/etc/powerdns/froxlor/pdns_froxlor.conf" chown="root:root"
-						chmod="600">
+					<file name="/etc/powerdns/froxlor/pdns_froxlor.conf"
+						chown="root:root" chmod="600">
 						<content><![CDATA[
 # mysql-settings / you need to create the power-dns database for yourself!
 launch=gmysql
@@ -386,7 +387,8 @@ gmysql-password=
 					</file>
 					<command><![CDATA[/etc/init.d/pdns restart]]></command>
 				</daemon>
-				<daemon name="powerdns_bind" title="PowerDNS via bind-backend">
+				<daemon name="powerdns_bind"
+					title="PowerDNS via bind-backend">
 					<install><![CDATA[apt-get install pdns-server]]></install>
 					<file name="/etc/powerdns/pdns.conf" backup="true" chmod="600">
 						<content><![CDATA[
@@ -410,8 +412,8 @@ include-dir=/etc/powerdns/froxlor/
 						</content>
 					</file>
 					<command><![CDATA[mkdir -p /etc/powerdns/froxlor/]]></command>
-					<file name="/etc/powerdns/froxlor/pdns_froxlor.conf" chown="root:root"
-						chmod="600">
+					<file name="/etc/powerdns/froxlor/pdns_froxlor.conf"
+						chown="root:root" chmod="600">
 						<content><![CDATA[
 allow-axfr-ips=127.0.0.0/8,::1,<NAMESERVERS_IP>
 # add these entries to the list if any speficied: <AXFRSERVERS>
@@ -453,8 +455,8 @@ local-address=<SERVERIP>,127.0.0.1
 						<command><![CDATA[chmod 0750  {{settings.system.vmail_homedir}}]]></command>
 					</commands>
 					<files index="0">
-						<file name="/etc/postfix/mysql-virtual_alias_maps.cf" chown="root:postfix"
-							chmod="0640">
+						<file name="/etc/postfix/mysql-virtual_alias_maps.cf"
+							chown="root:postfix" chmod="0640">
 							<content><![CDATA[
 user = <SQL_UNPRIVILEGED_USER>
 password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -498,8 +500,8 @@ query = SELECT DISTINCT username FROM mail_users WHERE email in ((SELECT mail_vi
 ]]>
 							</content>
 						</file>
-						<file name="/etc/postfix/mysql-virtual_uid_maps.cf" chown="root:postfix"
-							chmod="0640">
+						<file name="/etc/postfix/mysql-virtual_uid_maps.cf"
+							chown="root:postfix" chmod="0640">
 							<content><![CDATA[
 user = <SQL_UNPRIVILEGED_USER>
 password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -510,8 +512,8 @@ query = SELECT uid FROM mail_users WHERE email = '%s'
 ]]>
 							</content>
 						</file>
-						<file name="/etc/postfix/mysql-virtual_gid_maps.cf" chown="root:postfix"
-							chmod="0640">
+						<file name="/etc/postfix/mysql-virtual_gid_maps.cf"
+							chown="root:postfix" chmod="0640">
 							<content><![CDATA[
 user = <SQL_UNPRIVILEGED_USER>
 password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -558,8 +560,8 @@ root:               root@<SERVERNAME>
 					</include>
 					<include>//service[@type='smtp']/general/commands[@index=2]
 					</include>
-					<file name="/etc/postfix/main.cf" chown="root:root" chmod="0644"
-						backup="true">
+					<file name="/etc/postfix/main.cf" chown="root:root"
+						chmod="0644" backup="true">
 						<content><![CDATA[
 ## General Postfix configuration
 # FQDN from Froxlor
@@ -654,8 +656,8 @@ debugger_command =
 						</content>
 					</file>
 					<include>//service[@type='smtp']/general/files[@index=0]</include>
-					<file name="/etc/postfix/master.cf" chown="root:root" chmod="0644"
-						backup="true" mode="append">
+					<file name="/etc/postfix/master.cf" chown="root:root"
+						chmod="0644" backup="true" mode="append">
 						<content><![CDATA[
 # Add these lines to be able to use dovecot as delivery agent
 # Dovecot LDA
@@ -676,8 +678,8 @@ dovecot	  unix	-	n	n	-	-	pipe
 					<install><![CDATA[apt-get install libsasl2-2 libsasl2-modules libsasl2-modules-sql]]></install>
 					<include>//service[@type='smtp']/general/commands[@index=2]
 					</include>
-					<file name="/etc/postfix/main.cf" chown="root:root" chmod="0644"
-						backup="true">
+					<file name="/etc/postfix/main.cf" chown="root:root"
+						chmod="0644" backup="true">
 						<content><![CDATA[
 ## General Postfix configuration
 # should be the default domain from your provider eg. "server100.provider.tld"
@@ -791,7 +793,8 @@ sql_select: SELECT password FROM mail_users WHERE username='%u@%r' OR email='%u@
 			<!-- IMAP/POP3 services -->
 			<service type="mail" title="{{lng.admin.configfiles.mail}}">
 				<!-- Dovecot -->
-				<daemon name="dovecot" version="2" title="Dovecot" default="true">
+				<daemon name="dovecot" version="2" title="Dovecot"
+					default="true">
 					<install><![CDATA[apt-get install dovecot-imapd dovecot-pop3d dovecot-postfix dovecot-mysql dovecot-managesieved dovecot-sieve mail-stack-delivery]]></install>
 					<file name="/etc/dovecot/conf.d/01-mail-stack-delivery.conf"
 						chown="root:root" chmod="0644" backup="true">
@@ -882,8 +885,8 @@ service auth {
 ]]>
 						</content>
 					</file>
-					<file name="/etc/dovecot/conf.d/10-auth.conf" chown="root:root"
-						chmod="0640" backup="true">
+					<file name="/etc/dovecot/conf.d/10-auth.conf"
+						chown="root:root" chmod="0640" backup="true">
 						<content><![CDATA[
 ##
 ## Authentication processes
@@ -1015,7 +1018,8 @@ auth_mechanisms = plain login
 ]]>
 						</content>
 					</file>
-					<file name="/etc/dovecot/conf.d/auth-sql.conf.ext" chown="root:0" chmod="0644" backup="true">
+					<file name="/etc/dovecot/conf.d/auth-sql.conf.ext"
+						chown="root:0" chmod="0644" backup="true">
 						<content><![CDATA[
 passdb {
     driver = sql
@@ -1045,8 +1049,8 @@ iterate_query = SELECT username AS user FROM mail_users WHERE (imap = 1 OR pop3
 				<!-- Courier -->
 				<daemon name="courier" title="Courier">
 					<install><![CDATA[apt-get install courier-pop courier-imap courier-authlib-mysql]]></install>
-					<file name="/etc/courier/authdaemonrc" chown="root:0" chmod="0600"
-						backup="true">
+					<file name="/etc/courier/authdaemonrc" chown="root:0"
+						chmod="0600" backup="true">
 						<content><![CDATA[
 ##VERSION: $Id: authdaemonrc.in,v 1.8 2001/10/07 02:16:22 mrsam Exp $
 #
@@ -1119,8 +1123,8 @@ authdaemonvar=/var/run/courier/authdaemon
 ]]>
 						</content>
 					</file>
-					<file name="/etc/courier/authmysqlrc" chown="root:0" chmod="0600"
-						backup="true">
+					<file name="/etc/courier/authmysqlrc" chown="root:0"
+						chmod="0600" backup="true">
 						<content><![CDATA[
 MYSQL_SERVER <SQL_HOST>
 MYSQL_USERNAME <SQL_UNPRIVILEGED_USER>
@@ -1148,7 +1152,8 @@ MYSQL_AUXOPTIONS_FIELD CONCAT("allowimap=",imap,",allowpop3=",pop3)
 				<!-- Proftpd -->
 				<daemon name="proftpd" title="ProFTPd" default="true">
 					<install><![CDATA[apt-get install proftpd-basic proftpd-mod-mysql]]></install>
-					<file name="/etc/proftpd/create-cert.sh" chown="root:0" chmod="0700">
+					<file name="/etc/proftpd/create-cert.sh" chown="root:0"
+						chmod="0700">
 						<content><![CDATA[#!/bin/bash
 [ -f /etc/ssl/certs/proftpd.crt ] || openssl req -new -x509 -newkey rsa:4096 -days 3650 -nodes -out /etc/ssl/certs/proftpd.crt -keyout /etc/ssl/private/proftpd.key -subj "/C=US/ST=Some-State/O=Internet Widgits Pty Ltd/CN=<SERVERNAME>"
 [ -f /etc/ssl/certs/proftpd_ec.crt ] || openssl req -new -x509 -nodes -newkey ec:<(openssl ecparam -name secp521r1) -keyout /etc/ssl/private/proftpd_ec.key -out /etc/ssl/certs/proftpd_ec.crt -days 3650 -subj "/C=US/ST=Some-State/O=Internet Widgits Pty Ltd/CN=<SERVERNAME>"
@@ -1160,8 +1165,8 @@ chmod 0600 /etc/ssl/private/proftpd.key /etc/ssl/private/proftpd_ec.key
 						<command><![CDATA[/etc/proftpd/create-cert.sh]]></command>
 						<command><![CDATA[rm -f /etc/proftpd/create-cert.sh]]></command>
 					</commands>
-					<file name="/etc/proftpd/proftpd.conf" chown="root:0" chmod="0600"
-						backup="true">
+					<file name="/etc/proftpd/proftpd.conf" chown="root:0"
+						chmod="0600" backup="true">
 						<content><![CDATA[
 #
 # /etc/proftpd/proftpd.conf -- This is a basic ProFTPD configuration file.
@@ -1296,8 +1301,8 @@ Include /etc/proftpd/tls.conf
 ]]>
 						</content>
 					</file>
-					<file name="/etc/proftpd/modules.conf" chown="root:0" chmod="0644"
-						backup="true">
+					<file name="/etc/proftpd/modules.conf" chown="root:0"
+						chmod="0644" backup="true">
 						<content><![CDATA[
 #
 # This file is used to manage DSO modules and features.
@@ -1403,7 +1408,8 @@ SQLNamedQuery insert-quota-tally INSERT "%{0}, %{1}, %{2}, %{3}, %{4},%{5}, %{6}
 ]]>
 						</content>
 					</file>
-					<file name="/etc/proftpd/tls.conf" chown="root:root" chmod="0644" backup="true">
+					<file name="/etc/proftpd/tls.conf" chown="root:root"
+						chmod="0644" backup="true">
 						<content><![CDATA[
 <IfModule mod_tls.c>
 TLSEngine                               on
@@ -1435,14 +1441,15 @@ TLSVerifyClient                         off
 				<!-- Pureftpd -->
 				<daemon name="pureftpd" title="PureFTPd">
 					<install><![CDATA[apt-get install pure-ftpd-common pure-ftpd-mysql]]></install>
-					<file name="/etc/pure-ftpd/conf/MinUID" chown="root:0" chmod="0644">
+					<file name="/etc/pure-ftpd/conf/MinUID" chown="root:0"
+						chmod="0644">
 						<content><![CDATA[
 1000
 ]]>
 						</content>
 					</file>
-					<file name="/etc/pure-ftpd/conf/MySQLConfigFile" chown="root:0"
-						chmod="0644">
+					<file name="/etc/pure-ftpd/conf/MySQLConfigFile"
+						chown="root:0" chmod="0644">
 						<content><![CDATA[
 /etc/pure-ftpd/db/mysql.conf
 ]]>
@@ -1469,8 +1476,8 @@ yes
 ]]>
 						</content>
 					</file>
-					<file name="/etc/pure-ftpd/conf/PAMAuthentication" chown="root:0"
-						chmod="0644">
+					<file name="/etc/pure-ftpd/conf/PAMAuthentication"
+						chown="root:0" chmod="0644">
 						<content><![CDATA[
 no
 ]]>
@@ -1500,7 +1507,8 @@ MySQLGetQTASZ 	SELECT panel_customers.diskspace/1024 AS QuotaSize FROM panel_cus
 ]]>
 						</content>
 					</file>
-					<file name="/etc/pure-ftpd/conf/Bind" chown="root:0" chmod="0644">
+					<file name="/etc/pure-ftpd/conf/Bind" chown="root:0"
+						chmod="0644">
 						<content><![CDATA[
 21
 ]]>
@@ -1523,7 +1531,8 @@ UPLOADGID=
 			<!-- System tools/services -->
 			<service type="system" title="{{lng.admin.configfiles.etc}}">
 				<!-- Cronjob -->
-				<daemon name="cron" title="Cronjob for froxlor" mandatory="true">
+				<daemon name="cron" title="Cronjob for froxlor"
+					mandatory="true">
 					<file name="/etc/cron.d/froxlor" chown="root:0" chmod="0640">
 						<content><![CDATA[
 #
@@ -1542,7 +1551,8 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 					<command><![CDATA[{{settings.system.crondreload}}]]></command>
 				</daemon>
 				<!-- AWstats -->
-				<daemon name="awstats" title="Awstats (webalizer alternative)">
+				<daemon name="awstats"
+					title="Awstats (webalizer alternative)">
 					<install><![CDATA[apt-get install awstats]]></install>
 					<command><![CDATA[cp /usr/share/awstats/tools/awstats_buildstaticpages.pl {{settings.system.awstats_path}}]]></command>
 					<command><![CDATA[mv {{settings.system.awstats_conf}}/awstats.conf {{settings.system.awstats_conf}}/awstats.model.conf]]></command>
@@ -1551,10 +1561,11 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 					<command><![CDATA[rm /etc/cron.d/awstats]]></command>
 				</daemon>
 				<!-- libnss-mysql -->
-				<daemon name="libnss" title="libnss-mysql (required for FCGID/php-fpm/mpm-itk)">
+				<daemon name="libnss"
+					title="libnss-mysql (required for FCGID/php-fpm/mpm-itk)">
 					<install><![CDATA[apt-get install libnss-mysql-bg nscd]]></install>
-					<file name="/etc/libnss-mysql.cfg" chown="root:root" chmod="0600"
-						backup="true">
+					<file name="/etc/libnss-mysql.cfg" chown="root:root"
+						chmod="0600" backup="true">
 						<content><![CDATA[
 getpwnam    SELECT username,'x',uid,gid,'Froxlor Customer',homedir,shell \
             FROM ftp_users \
@@ -1646,7 +1657,8 @@ aliases:     files
 					<command><![CDATA[nscd --invalidate=group]]></command>
 				</daemon>
 				<!-- libnss-extrausers -->
-				<daemon name="libnssextrausers" title="libnss-extrausers (alternative to libnss-mysql, required for FCGID/php-fpm/mpm-itk)">
+				<daemon name="libnssextrausers"
+					title="libnss-extrausers (alternative to libnss-mysql, required for FCGID/php-fpm/mpm-itk)">
 					<install><![CDATA[apt-get install nscd libnss-extrausers]]></install>
 					<commands index="1">
 						<command><![CDATA[mkdir -p /var/lib/extrausers]]></command>
@@ -1686,7 +1698,8 @@ aliases:     files
 				<!-- Logrotate -->
 				<daemon name="logrotate" title="Logrotate">
 					<install><![CDATA[apt-get install logrotate]]></install>
-					<file name="/etc/logrotate.d/froxlor" chown="root:root" chmod="0644">
+					<file name="/etc/logrotate.d/froxlor" chown="root:root"
+						chmod="0644">
 						<content><![CDATA[
 #
 # Froxlor logrotate snipet
@@ -1721,12 +1734,13 @@ aliases:     files
 						<command><![CDATA[mkdir -p {{settings.system.mod_fcgid_tmpdir}}]]></command>
 						<command><![CDATA[a2dismod php5]]></command>
 					</commands>
-					<!-- instead of just restarting apache, we let the cronjob do all the
+					<!-- instead of just restarting apache, we let the cronjob do all the 
 						dirty work -->
 					<command><![CDATA[php {{const.\Froxlor\Froxlor::getInstallDir()}}/scripts/froxlor_master_cronjob.php --force]]></command>
 				</daemon>
 				<!-- PHP-FPM -->
-				<daemon name="php-fpm" title="PHP-FPM (alternative to mod_php)">
+				<daemon name="php-fpm"
+					title="PHP-FPM (alternative to mod_php)">
 					<commands index="1">
 						<visibility mode="equals" value="apache2">{{settings.system.webserver}}
 						</visibility>
@@ -1764,7 +1778,7 @@ aliases:     files
 						</visibility>
 						<command><![CDATA[/etc/init.d/apache2 restart]]></command>
 					</commands>
-					<!-- instead of just restarting apache, we let the cronjob do all the
+					<!-- instead of just restarting apache, we let the cronjob do all the 
 						dirty work -->
 					<command><![CDATA[php {{const.\Froxlor\Froxlor::getInstallDir()}}/scripts/froxlor_master_cronjob.php --force]]></command>
 				</daemon>

lib/configfiles/rhel_centos.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <froxlor>
-	<distribution name="RHEL / CentOS" version="7" defaulteditor="/usr/bin/nano">
+	<distribution name="RHEL / CentOS" version="7"
+		defaulteditor="/usr/bin/nano">
 		<services>
 			<!-- HTTP -->
 			<service type="http" title="{{lng.admin.configfiles.http}}">
@@ -87,8 +88,8 @@ Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}
 						<command><![CDATA[chmod 0750  {{settings.system.vmail_homedir}}]]></command>
 					</commands>
 					<files index="0">
-						<file name="/etc/postfix/mysql-virtual_alias_maps.cf" chown="root:postfix"
-							chmod="0640">
+						<file name="/etc/postfix/mysql-virtual_alias_maps.cf"
+							chown="root:postfix" chmod="0640">
 							<content><![CDATA[
 user = <SQL_UNPRIVILEGED_USER>
 password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -132,8 +133,8 @@ query = SELECT DISTINCT username FROM mail_users WHERE email in ((SELECT mail_vi
 ]]>
 							</content>
 						</file>
-						<file name="/etc/postfix/mysql-virtual_uid_maps.cf" chown="root:postfix"
-							chmod="0640">
+						<file name="/etc/postfix/mysql-virtual_uid_maps.cf"
+							chown="root:postfix" chmod="0640">
 							<content><![CDATA[
 user = <SQL_UNPRIVILEGED_USER>
 password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -144,8 +145,8 @@ query = SELECT uid FROM mail_users WHERE email = '%s'
 ]]>
 							</content>
 						</file>
-						<file name="/etc/postfix/mysql-virtual_gid_maps.cf" chown="root:postfix"
-							chmod="0640">
+						<file name="/etc/postfix/mysql-virtual_gid_maps.cf"
+							chown="root:postfix" chmod="0640">
 							<content><![CDATA[
 user = <SQL_UNPRIVILEGED_USER>
 password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -164,16 +165,16 @@ query = SELECT gid FROM mail_users WHERE email = '%s'
 					</commands>
 				</general>
 				<!-- postfix with dovecot -->
-				<daemon name="postfix_dovecot" version="2.10" title="Postfix with dovecot"
-					default="true">
+				<daemon name="postfix_dovecot" version="2.10"
+					title="Postfix with dovecot" default="true">
 					<include>//service[@type='smtp']/general/commands[@index=1]
 					</include>
 					<include>//service[@type='smtp']/general/installs[@index=1]
 					</include>
 					<include>//service[@type='smtp']/general/commands[@index=2]
 					</include>
-					<file name="/etc/postfix/main.cf" chown="root:root" chmod="0644"
-						backup="true">
+					<file name="/etc/postfix/main.cf" chown="root:root"
+						chmod="0644" backup="true">
 						<content><![CDATA[
 ## General Postfix configuration
 # FQDN from Froxlor
@@ -262,8 +263,8 @@ debugger_command =
 						</content>
 					</file>
 					<include>//service[@type='smtp']/general/files[@index=0]</include>
-					<file name="/etc/postfix/master.cf" chown="root:root" chmod="0644"
-						backup="true" mode="append">
+					<file name="/etc/postfix/master.cf" chown="root:root"
+						chmod="0644" backup="true" mode="append">
 						<content><![CDATA[
 # added for Froxlor
 dovecot			unix	-	n	n	-	-	pipe flags=DRhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${recipient}
@@ -277,7 +278,8 @@ dovecot			unix	-	n	n	-	-	pipe flags=DRhu user=vmail:vmail argv=/usr/libexec/dove
 			<!-- IMAP/POP3 services -->
 			<service type="mail" title="{{lng.admin.configfiles.mail}}">
 				<!-- Dovecot -->
-				<daemon name="dovecot" version="2.2" title="Dovecot" default="true">
+				<daemon name="dovecot" version="2.2" title="Dovecot"
+					default="true">
 					<install><![CDATA[yum install dovecot dovecot-mysql dovecot-pigeonhole]]></install>
 					<file name="/etc/dovecot/dovecot.conf" chown="root:root"
 						chmod="0644" backup="true">
@@ -504,8 +506,8 @@ auth_mechanisms = plain
 ]]>
 						</content>
 					</file>
-					<file name="/etc/dovecot/conf.d/10-logging.conf" chown="root:0"
-						chmod="0644" backup="true">
+					<file name="/etc/dovecot/conf.d/10-logging.conf"
+						chown="root:0" chmod="0644" backup="true">
 						<content><![CDATA[
 ##
 ## Log destination.
@@ -1215,8 +1217,8 @@ protocol lda {
 ]]>
 						</content>
 					</file>
-					<file name="/etc/dovecot/conf.d/15-mailboxes.conf" chown="root:0"
-						chmod="0644" backup="true">
+					<file name="/etc/dovecot/conf.d/15-mailboxes.conf"
+						chown="root:0" chmod="0644" backup="true">
 						<content><![CDATA[
 ##
 ## Mailbox definitions
@@ -1364,8 +1366,8 @@ protocol lmtp {
 ]]>
 						</content>
 					</file>
-					<file name="/etc/dovecot/conf.d/20-managesieve.conf" chown="root:0"
-						chmod="0644" backup="true">
+					<file name="/etc/dovecot/conf.d/20-managesieve.conf"
+						chown="root:0" chmod="0644" backup="true">
 						<content><![CDATA[
 ##
 ## ManageSieve specific settings
@@ -1821,10 +1823,11 @@ iterate_query = SELECT username AS user FROM mail_users
 			<!-- FTP services -->
 			<service type="ftp" title="{{lng.admin.configfiles.ftp}}">
 				<!-- Proftpd -->
-				<daemon name="proftpd" version="1.3" title="ProFTPd" default="true">
+				<daemon name="proftpd" version="1.3" title="ProFTPd"
+					default="true">
 					<install><![CDATA[yum install proftpd proftpd-mysql]]></install>
-					<file name="/etc/proftpd/proftpd.conf" chown="root:0" chmod="0600"
-						backup="true">
+					<file name="/etc/proftpd/proftpd.conf" chown="root:0"
+						chmod="0600" backup="true">
 						<content><![CDATA[
 # This is the ProFTPD configuration file
 #
@@ -2284,7 +2287,8 @@ ControlsLog			/var/log/proftpd/controls.log
 			<!-- System tools/services -->
 			<service type="system" title="{{lng.admin.configfiles.etc}}">
 				<!-- Cronjob -->
-				<daemon name="cron" title="Cronjob for froxlor" mandatory="true">
+				<daemon name="cron" title="Cronjob for froxlor"
+					mandatory="true">
 					<file name="/etc/cron.d/froxlor" chown="root:0" chmod="0640">
 						<content><![CDATA[
 #
@@ -2303,17 +2307,19 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
 					<command><![CDATA[{{settings.system.crondreload}}]]></command>
 				</daemon>
 				<!-- AWstats -->
-				<daemon name="awstats" title="Awstats (webalizer alternative)">
+				<daemon name="awstats"
+					title="Awstats (webalizer alternative)">
 					<command><![CDATA[sed -i.bak 's/^DirData/# DirData/' {{settings.system.awstats_conf}}/awstats.model.conf]]></command>
 					<command><![CDATA[sed -i.bak 's|^\\(DirIcons=\\).*$|\\1\\"/awstats-icon\\"|' {{settings.system.awstats_conf}}/awstats.model.conf]]></command>
 					<command><![CDATA[rm /etc/cron.d/awstats]]></command>
 				</daemon>
 				<!-- libnss-mysql -->
-				<daemon name="libnss" title="libnss-mysql (required for FCGID/php-fpm/mpm-itk)">
+				<daemon name="libnss"
+					title="libnss-mysql (required for FCGID/php-fpm/mpm-itk)">
 					<install><![CDATA[yum --enablerepo=extras install epel-release]]></install>
 					<install><![CDATA[yum install libnss-mysql nscd]]></install>
-					<file name="/etc/libnss-mysql.cfg" chown="root:root" chmod="0600"
-						backup="true">
+					<file name="/etc/libnss-mysql.cfg" chown="root:root"
+						chmod="0600" backup="true">
 						<content><![CDATA[
 getpwnam    SELECT username,'x',uid,gid,'Froxlor Customer',homedir,shell \
             FROM ftp_users \
@@ -2413,7 +2419,8 @@ aliases:	files nisplus
 				<!-- Logrotate -->
 				<daemon name="logrotate" title="Logrotate">
 					<install><![CDATA[yum install logrotate]]></install>
-					<file name="/etc/logrotate.d/froxlor" chown="root:root" chmod="0644">
+					<file name="/etc/logrotate.d/froxlor" chown="root:root"
+						chmod="0644">
 						<content><![CDATA[
 #
 # Froxlor logrotate snipet

lib/configfiles/stretch.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <froxlor>
-	<distribution name="Debian" codename="Stretch" version="9.x" defaulteditor="/bin/nano">
+	<distribution name="Debian" codename="Stretch"
+		version="9.x" defaulteditor="/bin/nano">
 		<services>
 			<!-- HTTP -->
 			<service type="http" title="{{lng.admin.configfiles.http}}">
@@ -43,7 +44,8 @@
 					</commands>
 				</general>
 				<!-- HTTP Apache -->
-				<daemon name="apache" version="2.4" title="Apache 2.4" default="true">
+				<daemon name="apache" version="2.4" title="Apache 2.4"
+					default="true">
 					<install><![CDATA[apt-get install apache2]]></install>
 					<include>//service[@type='http']/general/commands</include>
 					<command><![CDATA[a2dismod userdir]]></command>
@@ -893,8 +895,8 @@ include-dir=/etc/powerdns/froxlor/
 						</content>
 					</file>
 					<command><![CDATA[mkdir -p /etc/powerdns/froxlor/]]></command>
-					<file name="/etc/powerdns/froxlor/pdns_froxlor.conf" chown="root:root"
-						chmod="600">
+					<file name="/etc/powerdns/froxlor/pdns_froxlor.conf"
+						chown="root:root" chmod="600">
 						<content><![CDATA[
 # mysql-settings / you need to create the power-dns database for yourself!
 launch=gmysql
@@ -909,7 +911,8 @@ gmysql-password=
 					</file>
 					<command><![CDATA[/etc/init.d/pdns restart]]></command>
 				</daemon>
-				<daemon name="powerdns_bind" title="PowerDNS via bind-backend">
+				<daemon name="powerdns_bind"
+					title="PowerDNS via bind-backend">
 					<install><![CDATA[apt-get install pdns-server]]></install>
 					<file name="/etc/powerdns/pdns.conf" backup="true" chmod="600">
 						<content><![CDATA[
@@ -1436,8 +1439,8 @@ include-dir=/etc/powerdns/froxlor/
 						</content>
 					</file>
 					<command><![CDATA[mkdir -p /etc/powerdns/froxlor/]]></command>
-					<file name="/etc/powerdns/froxlor/pdns_froxlor.conf" chown="root:root"
-						chmod="600">
+					<file name="/etc/powerdns/froxlor/pdns_froxlor.conf"
+						chown="root:root" chmod="600">
 						<content><![CDATA[
 # Bind backend configuration
 
@@ -1483,8 +1486,8 @@ bind-check-interval=180
 						<command><![CDATA[chmod 0750  {{settings.system.vmail_homedir}}]]></command>
 					</commands>
 					<files index="0">
-						<file name="/etc/postfix/mysql-virtual_alias_maps.cf" chown="root:postfix"
-							chmod="0640">
+						<file name="/etc/postfix/mysql-virtual_alias_maps.cf"
+							chown="root:postfix" chmod="0640">
 							<content><![CDATA[
 user = <SQL_UNPRIVILEGED_USER>
 password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -1528,8 +1531,8 @@ query = SELECT DISTINCT username FROM mail_users WHERE email in ((SELECT mail_vi
 ]]>
 							</content>
 						</file>
-						<file name="/etc/postfix/mysql-virtual_uid_maps.cf" chown="root:postfix"
-							chmod="0640">
+						<file name="/etc/postfix/mysql-virtual_uid_maps.cf"
+							chown="root:postfix" chmod="0640">
 							<content><![CDATA[
 user = <SQL_UNPRIVILEGED_USER>
 password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -1540,8 +1543,8 @@ query = SELECT uid FROM mail_users WHERE email = '%s'
 ]]>
 							</content>
 						</file>
-						<file name="/etc/postfix/mysql-virtual_gid_maps.cf" chown="root:postfix"
-							chmod="0640">
+						<file name="/etc/postfix/mysql-virtual_gid_maps.cf"
+							chown="root:postfix" chmod="0640">
 							<content><![CDATA[
 user = <SQL_UNPRIVILEGED_USER>
 password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -1588,8 +1591,8 @@ root:               root@<SERVERNAME>
 					</include>
 					<include>//service[@type='smtp']/general/commands[@index=2]
 					</include>
-					<file name="/etc/postfix/main.cf" chown="root:root" chmod="0644"
-						backup="true">
+					<file name="/etc/postfix/main.cf" chown="root:root"
+						chmod="0644" backup="true">
 						<content><![CDATA[
 # Global Postfix configuration file. This file lists only a subset
 # of all parameters. For the syntax, and for a complete parameter
@@ -2334,8 +2337,8 @@ virtual_mailbox_limit = 0
 						</content>
 					</file>
 					<include>//service[@type='smtp']/general/files[@index=0]</include>
-					<file name="/etc/postfix/master.cf" chown="root:root" chmod="0644"
-						backup="true">
+					<file name="/etc/postfix/master.cf" chown="root:root"
+						chmod="0644" backup="true">
 						<content><![CDATA[
 #
 # Postfix master process configuration file.  For details on the format
@@ -2586,8 +2589,8 @@ dict {
 ]]>
 							</content>
 						</file>
-						<file name="/etc/dovecot/dovecot-sql.conf.ext" chown="root:root"
-							chmod="0600" backup="true">
+						<file name="/etc/dovecot/dovecot-sql.conf.ext"
+							chown="root:root" chmod="0600" backup="true">
 							<content><![CDATA[
 # This file is commonly accessed via passdb {} or userdb {} section in
 # conf.d/auth-sql.conf.ext
@@ -3246,8 +3249,8 @@ mail_access_groups = vmail
 ]]>
 							</content>
 						</file>
-						<file name="/etc/dovecot/conf.d/10-master.conf" chown="root:0"
-							chmod="0644" backup="true">
+						<file name="/etc/dovecot/conf.d/10-master.conf"
+							chown="root:0" chmod="0644" backup="true">
 							<content><![CDATA[
 #default_process_limit = 100
 #default_client_limit = 1000
@@ -3569,8 +3572,8 @@ protocol imap {
 ]]>
 							</content>
 						</file>
-						<file name="/etc/dovecot/conf.d/20-managesieve.conf" chown="root:0"
-							chmod="0644" backup="true">
+						<file name="/etc/dovecot/conf.d/20-managesieve.conf"
+							chown="root:0" chmod="0644" backup="true">
 							<content><![CDATA[
 ##
 ## ManageSieve specific settings
@@ -3872,8 +3875,8 @@ plugin {
 					</commands>
 				</general>
 				<!-- Dovecot with postfix -->
-				<daemon name="dovecot_postfix" version="2" title="Dovecot with postfix"
-					default="true">
+				<daemon name="dovecot_postfix" version="2"
+					title="Dovecot with postfix" default="true">
 					<include>//service[@type='mail']/general/installs[@index=1]
 					</include>
 					<include>//service[@type='mail']/general/files[@index=1]
@@ -3887,7 +3890,8 @@ plugin {
 				<!-- Proftpd -->
 				<daemon name="proftpd" title="ProFTPd" default="true">
 					<install><![CDATA[apt-get install proftpd-basic proftpd-mod-mysql]]></install>
-					<file name="/etc/proftpd/create-cert.sh" chown="root:0" chmod="0700">
+					<file name="/etc/proftpd/create-cert.sh" chown="root:0"
+						chmod="0700">
 						<content><![CDATA[#!/bin/bash
 [ -f /etc/ssl/certs/proftpd.crt ] || openssl req -new -x509 -newkey rsa:4096 -days 3650 -nodes -out /etc/ssl/certs/proftpd.crt -keyout /etc/ssl/private/proftpd.key -subj "/C=US/ST=Some-State/O=Internet Widgits Pty Ltd/CN=<SERVERNAME>"
 [ -f /etc/ssl/certs/proftpd_ec.crt ] || openssl req -new -x509 -nodes -newkey ec:<(openssl ecparam -name secp521r1) -keyout /etc/ssl/private/proftpd_ec.key -out /etc/ssl/certs/proftpd_ec.crt -days 3650 -subj "/C=US/ST=Some-State/O=Internet Widgits Pty Ltd/CN=<SERVERNAME>"
@@ -3899,8 +3903,8 @@ chmod 0600 /etc/ssl/private/proftpd.key /etc/ssl/private/proftpd_ec.key
 						<command><![CDATA[/etc/proftpd/create-cert.sh]]></command>
 						<command><![CDATA[rm -f /etc/proftpd/create-cert.sh]]></command>
 					</commands>
-					<file name="/etc/proftpd/proftpd.conf" chown="root:0" chmod="0600"
-						backup="true">
+					<file name="/etc/proftpd/proftpd.conf" chown="root:0"
+						chmod="0600" backup="true">
 						<content><![CDATA[
 #
 # /etc/proftpd/proftpd.conf -- This is a basic ProFTPD configuration file.
@@ -4094,8 +4098,8 @@ Include /etc/proftpd/conf.d/
 ]]>
 						</content>
 					</file>
-					<file name="/etc/proftpd/modules.conf" chown="root:0" chmod="0644"
-						backup="true">
+					<file name="/etc/proftpd/modules.conf" chown="root:0"
+						chmod="0644" backup="true">
 						<content><![CDATA[
 #
 # This file is used to manage DSO modules and features.
@@ -4262,7 +4266,8 @@ SQLNamedQuery insert-quota-tally INSERT "%{0}, %{1}, %{2}, %{3}, %{4},%{5}, %{6}
 ]]>
 						</content>
 					</file>
-					<file name="/etc/proftpd/tls.conf" chown="root:root" chmod="0644" backup="true">
+					<file name="/etc/proftpd/tls.conf" chown="root:root"
+						chmod="0644" backup="true">
 						<content><![CDATA[
 <IfModule mod_tls.c>
 TLSEngine                               on
@@ -4294,14 +4299,15 @@ TLSVerifyClient                         off
 				<!-- Pureftpd -->
 				<daemon name="pureftpd" title="PureFTPd">
 					<install><![CDATA[apt-get install pure-ftpd-common pure-ftpd-mysql]]></install>
-					<file name="/etc/pure-ftpd/conf/MinUID" chown="root:0" chmod="0644">
+					<file name="/etc/pure-ftpd/conf/MinUID" chown="root:0"
+						chmod="0644">
 						<content><![CDATA[
 1000
 ]]>
 						</content>
 					</file>
-					<file name="/etc/pure-ftpd/conf/MySQLConfigFile" chown="root:0"
-						chmod="0644">
+					<file name="/etc/pure-ftpd/conf/MySQLConfigFile"
+						chown="root:0" chmod="0644">
 						<content><![CDATA[
 /etc/pure-ftpd/db/mysql.conf
 ]]>
@@ -4328,8 +4334,8 @@ yes
 ]]>
 						</content>
 					</file>
-					<file name="/etc/pure-ftpd/conf/PAMAuthentication" chown="root:0"
-						chmod="0644">
+					<file name="/etc/pure-ftpd/conf/PAMAuthentication"
+						chown="root:0" chmod="0644">
 						<content><![CDATA[
 no
 ]]>
@@ -4475,7 +4481,8 @@ MySQLGetQTASZ  SELECT panel_customers.diskspace/1024 AS QuotaSize FROM panel_cus
 ]]>
 						</content>
 					</file>
-					<file name="/etc/pure-ftpd/conf/Bind" chown="root:0" chmod="0644">
+					<file name="/etc/pure-ftpd/conf/Bind" chown="root:0"
+						chmod="0644">
 						<content><![CDATA[
 21
 ]]>
@@ -4519,7 +4526,8 @@ UPLOADGID=
 			<!-- System tools/services -->
 			<service type="system" title="{{lng.admin.configfiles.etc}}">
 				<!-- Cronjob -->
-				<daemon name="cron" title="Cronjob for froxlor" mandatory="true">
+				<daemon name="cron" title="Cronjob for froxlor"
+					mandatory="true">
 					<file name="/etc/cron.d/froxlor" chown="root:0" chmod="0640">
 						<content><![CDATA[
 #
@@ -4538,7 +4546,8 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 					<command><![CDATA[{{settings.system.crondreload}}]]></command>
 				</daemon>
 				<!-- AWstats -->
-				<daemon name="awstats" title="Awstats (webalizer alternative)">
+				<daemon name="awstats"
+					title="Awstats (webalizer alternative)">
 					<install><![CDATA[apt-get install awstats]]></install>
 					<command><![CDATA[cp /usr/share/awstats/tools/awstats_buildstaticpages.pl {{settings.system.awstats_path}}]]></command>
 					<command><![CDATA[mv {{settings.system.awstats_conf}}/awstats.conf {{settings.system.awstats_conf}}/awstats.model.conf]]></command>
@@ -4547,7 +4556,8 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 					<command><![CDATA[rm /etc/cron.d/awstats]]></command>
 				</daemon>
 				<!-- libnss-extrausers -->
-				<daemon name="libnssextrausers" title="libnss-extrausers (alternative to libnss-mysql, required for FCGID/php-fpm/mpm-itk)">
+				<daemon name="libnssextrausers"
+					title="libnss-extrausers (alternative to libnss-mysql, required for FCGID/php-fpm/mpm-itk)">
 					<install><![CDATA[apt-get install nscd libnss-extrausers]]></install>
 					<commands index="1">
 						<command><![CDATA[mkdir -p /var/lib/extrausers]]></command>
@@ -4587,7 +4597,8 @@ aliases:     files
 				<!-- Logrotate -->
 				<daemon name="logrotate" title="Logrotate">
 					<install><![CDATA[apt-get install logrotate]]></install>
-					<file name="/etc/logrotate.d/froxlor" chown="root:root" chmod="0644">
+					<file name="/etc/logrotate.d/froxlor" chown="root:root"
+						chmod="0644">
 						<content><![CDATA[
 #
 # Froxlor logrotate snipet
@@ -4622,12 +4633,13 @@ aliases:     files
 						<command><![CDATA[mkdir -p {{settings.system.mod_fcgid_tmpdir}}]]></command>
 						<command><![CDATA[a2dismod php7.0]]></command>
 					</commands>
-					<!-- instead of just restarting apache, we let the cronjob do all the
+					<!-- instead of just restarting apache, we let the cronjob do all the 
 						dirty work -->
 					<command><![CDATA[php {{const.\Froxlor\Froxlor::getInstallDir()}}/scripts/froxlor_master_cronjob.php --force]]></command>
 				</daemon>
 				<!-- PHP-FPM -->
-				<daemon name="php-fpm" title="PHP-FPM (alternative to mod_php)">
+				<daemon name="php-fpm"
+					title="PHP-FPM (alternative to mod_php)">
 					<install>
 						<visibility mode="equals" value="apache2">{{settings.system.webserver}}
 						</visibility>
@@ -4659,7 +4671,7 @@ aliases:     files
 						</visibility>
 						<command><![CDATA[/etc/init.d/apache2 restart]]></command>
 					</commands>
-					<!-- instead of just restarting apache, we let the cronjob do all the
+					<!-- instead of just restarting apache, we let the cronjob do all the 
 						dirty work -->
 					<command><![CDATA[php {{const.\Froxlor\Froxlor::getInstallDir()}}/scripts/froxlor_master_cronjob.php --force]]></command>
 				</daemon>

lib/configfiles/trusty.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <froxlor>
-	<distribution name="Ubuntu" codename="Trusty" version="14.04" defaulteditor="/usr/bin/nano">
+	<distribution name="Ubuntu" codename="Trusty"
+		version="14.04" defaulteditor="/usr/bin/nano">
 		<services>
 			<!-- HTTP -->
 			<service type="http" title="{{lng.admin.configfiles.http}}">
@@ -408,8 +409,8 @@ include-dir=/etc/powerdns/froxlor/
 						</content>
 					</file>
 					<command><![CDATA[mkdir -p /etc/powerdns/froxlor/]]></command>
-					<file name="/etc/powerdns/froxlor/pdns_froxlor.conf" chown="root:root"
-						chmod="600">
+					<file name="/etc/powerdns/froxlor/pdns_froxlor.conf"
+						chown="root:root" chmod="600">
 						<content><![CDATA[
 # mysql-settings / you need to create the power-dns database for yourself!
 launch=gmysql
@@ -424,7 +425,8 @@ gmysql-password=
 					</file>
 					<command><![CDATA[service pdns restart]]></command>
 				</daemon>
-				<daemon name="powerdns_bind" title="PowerDNS via bind-backend">
+				<daemon name="powerdns_bind"
+					title="PowerDNS via bind-backend">
 					<install><![CDATA[apt-get install pdns-server]]></install>
 					<file name="/etc/powerdns/pdns.conf" backup="true">
 						<content><![CDATA[
@@ -450,8 +452,8 @@ include-dir=/etc/powerdns/froxlor/
 						</content>
 					</file>
 					<command><![CDATA[mkdir -p /etc/powerdns/froxlor/]]></command>
-					<file name="/etc/powerdns/froxlor/pdns_froxlor.conf" chown="root:root"
-						chmod="600">
+					<file name="/etc/powerdns/froxlor/pdns_froxlor.conf"
+						chown="root:root" chmod="600">
 						<content><![CDATA[
 allow-axfr-ips=127.0.0.0/8,::1,<NAMESERVERS_IP>
 # add these entries to the list if any speficied: <AXFRSERVERS>
@@ -493,8 +495,8 @@ local-address=<SERVERIP>,127.0.0.1
 						<command><![CDATA[chmod 0750  {{settings.system.vmail_homedir}}]]></command>
 					</commands>
 					<files index="0">
-						<file name="/etc/postfix/mysql-virtual_alias_maps.cf" chown="root:postfix"
-							chmod="0640">
+						<file name="/etc/postfix/mysql-virtual_alias_maps.cf"
+							chown="root:postfix" chmod="0640">
 							<content><![CDATA[
 user = <SQL_UNPRIVILEGED_USER>
 password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -538,8 +540,8 @@ query = SELECT DISTINCT username FROM mail_users WHERE email in ((SELECT mail_vi
 ]]>
 							</content>
 						</file>
-						<file name="/etc/postfix/mysql-virtual_uid_maps.cf" chown="root:postfix"
-							chmod="0640">
+						<file name="/etc/postfix/mysql-virtual_uid_maps.cf"
+							chown="root:postfix" chmod="0640">
 							<content><![CDATA[
 user = <SQL_UNPRIVILEGED_USER>
 password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -550,8 +552,8 @@ query = SELECT uid FROM mail_users WHERE email = '%s'
 ]]>
 							</content>
 						</file>
-						<file name="/etc/postfix/mysql-virtual_gid_maps.cf" chown="root:postfix"
-							chmod="0640">
+						<file name="/etc/postfix/mysql-virtual_gid_maps.cf"
+							chown="root:postfix" chmod="0640">
 							<content><![CDATA[
 user = <SQL_UNPRIVILEGED_USER>
 password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -598,8 +600,8 @@ root:               root@<SERVERNAME>
 					</include>
 					<include>//service[@type='smtp']/general/commands[@index=2]
 					</include>
-					<file name="/etc/postfix/main.cf" chown="root:root" chmod="0644"
-						backup="true">
+					<file name="/etc/postfix/main.cf" chown="root:root"
+						chmod="0644" backup="true">
 						<content><![CDATA[
 ## General Postfix configuration
 # FQDN from Froxlor
@@ -694,8 +696,8 @@ debugger_command =
 						</content>
 					</file>
 					<include>//service[@type='smtp']/general/files[@index=0]</include>
-					<file name="/etc/postfix/master.cf" chown="root:root" chmod="0644"
-						backup="true" mode="append">
+					<file name="/etc/postfix/master.cf" chown="root:root"
+						chmod="0644" backup="true" mode="append">
 						<content><![CDATA[
 # Add these lines to be able to use dovecot as delivery agent
 # Dovecot LDA
@@ -716,8 +718,8 @@ dovecot	  unix	-	n	n	-	-	pipe
 					<install><![CDATA[apt-get install libsasl2-2 libsasl2-modules libsasl2-modules-sql]]></install>
 					<include>//service[@type='smtp']/general/commands[@index=2]
 					</include>
-					<file name="/etc/postfix/main.cf" chown="root:root" chmod="0644"
-						backup="true">
+					<file name="/etc/postfix/main.cf" chown="root:root"
+						chmod="0644" backup="true">
 						<content><![CDATA[
 ## General Postfix configuration
 # should be the default domain from your provider eg. "server100.provider.tld"
@@ -831,7 +833,8 @@ sql_select: SELECT password FROM mail_users WHERE username='%u@%r' OR email='%u@
 			<!-- IMAP/POP3 services -->
 			<service type="mail" title="{{lng.admin.configfiles.mail}}">
 				<!-- Dovecot -->
-				<daemon name="dovecot" version="2" title="Dovecot" default="true">
+				<daemon name="dovecot" version="2" title="Dovecot"
+					default="true">
 					<install><![CDATA[apt-get install dovecot-imapd dovecot-pop3d dovecot-mysql mail-stack-delivery]]></install>
 					<file name="/etc/dovecot/conf.d/99-mail-stack-delivery.conf"
 						chown="root:root" chmod="0644" backup="true">
@@ -909,8 +912,8 @@ service auth {
 ]]>
 						</content>
 					</file>
-					<file name="/etc/dovecot/conf.d/10-auth.conf" chown="root:root"
-						chmod="0644" backup="true">
+					<file name="/etc/dovecot/conf.d/10-auth.conf"
+						chown="root:root" chmod="0644" backup="true">
 						<content><![CDATA[
 ##
 ## Authentication processes
@@ -1059,8 +1062,8 @@ iterate_query = SELECT username AS user FROM mail_users WHERE (imap = 1 OR pop3
 				<!-- Courier -->
 				<daemon name="courier" title="Courier">
 					<install><![CDATA[apt-get install courier-pop courier-imap courier-authlib-mysql]]></install>
-					<file name="/etc/courier/authdaemonrc" chown="root:0" chmod="0600"
-						backup="true">
+					<file name="/etc/courier/authdaemonrc" chown="root:0"
+						chmod="0600" backup="true">
 						<content><![CDATA[
 ##VERSION: $Id: authdaemonrc.in,v 1.8 2001/10/07 02:16:22 mrsam Exp $
 #
@@ -1133,8 +1136,8 @@ authdaemonvar=/var/run/courier/authdaemon
 ]]>
 						</content>
 					</file>
-					<file name="/etc/courier/authmysqlrc" chown="root:0" chmod="0600"
-						backup="true">
+					<file name="/etc/courier/authmysqlrc" chown="root:0"
+						chmod="0600" backup="true">
 						<content><![CDATA[
 MYSQL_SERVER <SQL_HOST>
 MYSQL_USERNAME <SQL_UNPRIVILEGED_USER>
@@ -1162,7 +1165,8 @@ MYSQL_AUXOPTIONS_FIELD CONCAT("allowimap=",imap,",allowpop3=",pop3)
 				<!-- Proftpd -->
 				<daemon name="proftpd" title="ProFTPd" default="true">
 					<install><![CDATA[apt-get install proftpd-basic proftpd-mod-mysql]]></install>
-					<file name="/etc/proftpd/create-cert.sh" chown="root:0" chmod="0700">
+					<file name="/etc/proftpd/create-cert.sh" chown="root:0"
+						chmod="0700">
 						<content><![CDATA[#!/bin/bash
 [ -f /etc/ssl/certs/proftpd.crt ] || openssl req -new -x509 -newkey rsa:4096 -days 3650 -nodes -out /etc/ssl/certs/proftpd.crt -keyout /etc/ssl/private/proftpd.key -subj "/C=US/ST=Some-State/O=Internet Widgits Pty Ltd/CN=<SERVERNAME>"
 [ -f /etc/ssl/certs/proftpd_ec.crt ] || openssl req -new -x509 -nodes -newkey ec:<(openssl ecparam -name secp521r1) -keyout /etc/ssl/private/proftpd_ec.key -out /etc/ssl/certs/proftpd_ec.crt -days 3650 -subj "/C=US/ST=Some-State/O=Internet Widgits Pty Ltd/CN=<SERVERNAME>"
@@ -1174,8 +1178,8 @@ chmod 0600 /etc/ssl/private/proftpd.key /etc/ssl/private/proftpd_ec.key
 						<command><![CDATA[/etc/proftpd/create-cert.sh]]></command>
 						<command><![CDATA[rm -f /etc/proftpd/create-cert.sh]]></command>
 					</commands>
-					<file name="/etc/proftpd/proftpd.conf" chown="root:0" chmod="0600"
-						backup="true">
+					<file name="/etc/proftpd/proftpd.conf" chown="root:0"
+						chmod="0600" backup="true">
 						<content><![CDATA[
 #
 # /etc/proftpd/proftpd.conf -- This is a basic ProFTPD configuration file.
@@ -1310,8 +1314,8 @@ Include /etc/proftpd/tls.conf
 ]]>
 						</content>
 					</file>
-					<file name="/etc/proftpd/modules.conf" chown="root:0" chmod="0644"
-						backup="true">
+					<file name="/etc/proftpd/modules.conf" chown="root:0"
+						chmod="0644" backup="true">
 						<content><![CDATA[
 #
 # This file is used to manage DSO modules and features.
@@ -1417,7 +1421,8 @@ SQLNamedQuery insert-quota-tally INSERT "%{0}, %{1}, %{2}, %{3}, %{4},%{5}, %{6}
 ]]>
 						</content>
 					</file>
-					<file name="/etc/proftpd/tls.conf" chown="root:root" chmod="0644" backup="true">
+					<file name="/etc/proftpd/tls.conf" chown="root:root"
+						chmod="0644" backup="true">
 						<content><![CDATA[
 <IfModule mod_tls.c>
 TLSEngine                               on
@@ -1449,14 +1454,15 @@ TLSVerifyClient                         off
 				<!-- Pureftpd -->
 				<daemon name="pureftpd" title="PureFTPd">
 					<install><![CDATA[apt-get install pure-ftpd-common pure-ftpd-mysql]]></install>
-					<file name="/etc/pure-ftpd/conf/MinUID" chown="root:0" chmod="0644">
+					<file name="/etc/pure-ftpd/conf/MinUID" chown="root:0"
+						chmod="0644">
 						<content><![CDATA[
 1000
 ]]>
 						</content>
 					</file>
-					<file name="/etc/pure-ftpd/conf/MySQLConfigFile" chown="root:0"
-						chmod="0644">
+					<file name="/etc/pure-ftpd/conf/MySQLConfigFile"
+						chown="root:0" chmod="0644">
 						<content><![CDATA[
 /etc/pure-ftpd/db/mysql.conf
 ]]>
@@ -1483,8 +1489,8 @@ yes
 ]]>
 						</content>
 					</file>
-					<file name="/etc/pure-ftpd/conf/PAMAuthentication" chown="root:0"
-						chmod="0644">
+					<file name="/etc/pure-ftpd/conf/PAMAuthentication"
+						chown="root:0" chmod="0644">
 						<content><![CDATA[
 no
 ]]>
@@ -1514,7 +1520,8 @@ MySQLGetQTASZ 	SELECT panel_customers.diskspace/1024 AS QuotaSize FROM panel_cus
 ]]>
 						</content>
 					</file>
-					<file name="/etc/pure-ftpd/conf/Bind" chown="root:0" chmod="0644">
+					<file name="/etc/pure-ftpd/conf/Bind" chown="root:0"
+						chmod="0644">
 						<content><![CDATA[
 21
 ]]>
@@ -1537,7 +1544,8 @@ UPLOADGID=
 			<!-- System tools/services -->
 			<service type="system" title="{{lng.admin.configfiles.etc}}">
 				<!-- Cronjob -->
-				<daemon name="cron" title="Cronjob for froxlor" mandatory="true">
+				<daemon name="cron" title="Cronjob for froxlor"
+					mandatory="true">
 					<file name="/etc/cron.d/froxlor" chown="root:0" chmod="0640">
 						<content><![CDATA[
 #
@@ -1556,7 +1564,8 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 					<command><![CDATA[{{settings.system.crondreload}}]]></command>
 				</daemon>
 				<!-- AWstats -->
-				<daemon name="awstats" title="Awstats (webalizer alternative)">
+				<daemon name="awstats"
+					title="Awstats (webalizer alternative)">
 					<install><![CDATA[apt-get install awstats]]></install>
 					<command><![CDATA[cp /usr/share/awstats/tools/awstats_buildstaticpages.pl {{settings.system.awstats_path}}]]></command>
 					<command><![CDATA[mv {{settings.system.awstats_conf}}/awstats.conf {{settings.system.awstats_conf}}/awstats.model.conf]]></command>
@@ -1565,10 +1574,11 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 					<command><![CDATA[rm /etc/cron.d/awstats]]></command>
 				</daemon>
 				<!-- libnss-mysql -->
-				<daemon name="libnss" title="libnss-mysql (required for FCGID/php-fpm/mpm-itk)">
+				<daemon name="libnss"
+					title="libnss-mysql (required for FCGID/php-fpm/mpm-itk)">
 					<install><![CDATA[apt-get install libnss-mysql-bg nscd]]></install>
-					<file name="/etc/libnss-mysql.cfg" chown="root:root" chmod="0600"
-						backup="true">
+					<file name="/etc/libnss-mysql.cfg" chown="root:root"
+						chmod="0600" backup="true">
 						<content><![CDATA[
 getpwnam    SELECT username,'x',uid,gid,'Froxlor Customer',homedir,shell \
             FROM ftp_users \
@@ -1660,7 +1670,8 @@ aliases:     files
 					<command><![CDATA[nscd --invalidate=group]]></command>
 				</daemon>
 				<!-- libnss-extrausers -->
-				<daemon name="libnssextrausers" title="libnss-extrausers (alternative to libnss-mysql, required for FCGID/php-fpm/mpm-itk)">
+				<daemon name="libnssextrausers"
+					title="libnss-extrausers (alternative to libnss-mysql, required for FCGID/php-fpm/mpm-itk)">
 					<install><![CDATA[apt-get install nscd libnss-extrausers]]></install>
 					<commands index="1">
 						<command><![CDATA[mkdir -p /var/lib/extrausers]]></command>
@@ -1700,7 +1711,8 @@ aliases:     files
 				<!-- Logrotate -->
 				<daemon name="logrotate" title="Logrotate">
 					<install><![CDATA[apt-get install logrotate]]></install>
-					<file name="/etc/logrotate.d/froxlor" chown="root:root" chmod="0644">
+					<file name="/etc/logrotate.d/froxlor" chown="root:root"
+						chmod="0644">
 						<content><![CDATA[
 #
 # Froxlor logrotate snipet
@@ -1735,12 +1747,13 @@ aliases:     files
 						<command><![CDATA[mkdir -p {{settings.system.mod_fcgid_tmpdir}}]]></command>
 						<command><![CDATA[a2dismod php5]]></command>
 					</commands>
-					<!-- instead of just restarting apache, we let the cronjob do all the
+					<!-- instead of just restarting apache, we let the cronjob do all the 
 						dirty work -->
 					<command><![CDATA[php {{const.\Froxlor\Froxlor::getInstallDir()}}/scripts/froxlor_master_cronjob.php --force]]></command>
 				</daemon>
 				<!-- PHP-FPM -->
-				<daemon name="php-fpm" title="PHP-FPM (alternative to mod_php)">
+				<daemon name="php-fpm"
+					title="PHP-FPM (alternative to mod_php)">
 					<commands index="1">
 						<visibility mode="equals" value="apache2">{{settings.system.webserver}}
 						</visibility>
@@ -1778,7 +1791,7 @@ aliases:     files
 						</visibility>
 						<command><![CDATA[/etc/init.d/apache2 restart]]></command>
 					</commands>
-					<!-- instead of just restarting apache, we let the cronjob do all the
+					<!-- instead of just restarting apache, we let the cronjob do all the 
 						dirty work -->
 					<command><![CDATA[php {{const.\Froxlor\Froxlor::getInstallDir()}}/scripts/froxlor_master_cronjob.php --force]]></command>
 				</daemon>

lib/configfiles/xenial.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <froxlor>
-	<distribution name="Ubuntu" codename="Xenial" version="16.04.x" defaulteditor="/bin/nano">
+	<distribution name="Ubuntu" codename="Xenial"
+		version="16.04.x" defaulteditor="/bin/nano">
 		<services>
 			<!-- HTTP -->
 			<service type="http" title="{{lng.admin.configfiles.http}}">
@@ -43,7 +44,8 @@
 					</commands>
 				</general>
 				<!-- HTTP Apache -->
-				<daemon name="apache" version="2.4" title="Apache 2.4" default="true">
+				<daemon name="apache" version="2.4" title="Apache 2.4"
+					default="true">
 					<install><![CDATA[apt-get install apache2]]></install>
 					<include>//service[@type='http']/general/commands</include>
 					<command><![CDATA[a2dismod userdir]]></command>
@@ -904,8 +906,8 @@ include-dir=/etc/powerdns/froxlor/
 						</content>
 					</file>
 					<command><![CDATA[mkdir -p /etc/powerdns/froxlor/]]></command>
-					<file name="/etc/powerdns/froxlor/pdns_froxlor.conf" chown="root:root"
-						chmod="600">
+					<file name="/etc/powerdns/froxlor/pdns_froxlor.conf"
+						chown="root:root" chmod="600">
 						<content><![CDATA[
 # mysql-settings / you need to create the power-dns database for yourself!
 launch=gmysql
@@ -920,7 +922,8 @@ gmysql-password=
 					</file>
 					<command><![CDATA[/etc/init.d/pdns restart]]></command>
 				</daemon>
-				<daemon name="powerdns_bind" title="PowerDNS via bind-backend">
+				<daemon name="powerdns_bind"
+					title="PowerDNS via bind-backend">
 					<install><![CDATA[apt-get install pdns-server]]></install>
 					<file name="/etc/powerdns/pdns.conf" backup="true" chmod="600">
 						<content><![CDATA[
@@ -1447,8 +1450,8 @@ include-dir=/etc/powerdns/froxlor/
 						</content>
 					</file>
 					<command><![CDATA[mkdir -p /etc/powerdns/froxlor/]]></command>
-					<file name="/etc/powerdns/froxlor/pdns_froxlor.conf" chown="root:root"
-						chmod="600">
+					<file name="/etc/powerdns/froxlor/pdns_froxlor.conf"
+						chown="root:root" chmod="600">
 						<content><![CDATA[
 # Bind backend configuration
 
@@ -1494,8 +1497,8 @@ bind-check-interval=180
 						<command><![CDATA[chmod 0750  {{settings.system.vmail_homedir}}]]></command>
 					</commands>
 					<files index="0">
-						<file name="/etc/postfix/mysql-virtual_alias_maps.cf" chown="root:postfix"
-							chmod="0640">
+						<file name="/etc/postfix/mysql-virtual_alias_maps.cf"
+							chown="root:postfix" chmod="0640">
 							<content><![CDATA[
 user = <SQL_UNPRIVILEGED_USER>
 password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -1539,8 +1542,8 @@ query = SELECT DISTINCT username FROM mail_users WHERE email in ((SELECT mail_vi
 ]]>
 							</content>
 						</file>
-						<file name="/etc/postfix/mysql-virtual_uid_maps.cf" chown="root:postfix"
-							chmod="0640">
+						<file name="/etc/postfix/mysql-virtual_uid_maps.cf"
+							chown="root:postfix" chmod="0640">
 							<content><![CDATA[
 user = <SQL_UNPRIVILEGED_USER>
 password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -1551,8 +1554,8 @@ query = SELECT uid FROM mail_users WHERE email = '%s'
 ]]>
 							</content>
 						</file>
-						<file name="/etc/postfix/mysql-virtual_gid_maps.cf" chown="root:postfix"
-							chmod="0640">
+						<file name="/etc/postfix/mysql-virtual_gid_maps.cf"
+							chown="root:postfix" chmod="0640">
 							<content><![CDATA[
 user = <SQL_UNPRIVILEGED_USER>
 password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -1599,8 +1602,8 @@ root:               root@<SERVERNAME>
 					</include>
 					<include>//service[@type='smtp']/general/commands[@index=2]
 					</include>
-					<file name="/etc/postfix/main.cf" chown="root:root" chmod="0644"
-						backup="true">
+					<file name="/etc/postfix/main.cf" chown="root:root"
+						chmod="0644" backup="true">
 						<content><![CDATA[
 # Global Postfix configuration file. This file lists only a subset
 # of all parameters. For the syntax, and for a complete parameter
@@ -2345,8 +2348,8 @@ virtual_mailbox_limit = 0
 						</content>
 					</file>
 					<include>//service[@type='smtp']/general/files[@index=0]</include>
-					<file name="/etc/postfix/master.cf" chown="root:root" chmod="0644"
-						backup="true">
+					<file name="/etc/postfix/master.cf" chown="root:root"
+						chmod="0644" backup="true">
 						<content><![CDATA[
 #
 # Postfix master process configuration file.  For details on the format
@@ -2597,8 +2600,8 @@ dict {
 ]]>
 							</content>
 						</file>
-						<file name="/etc/dovecot/dovecot-sql.conf.ext" chown="root:root"
-							chmod="0600" backup="true">
+						<file name="/etc/dovecot/dovecot-sql.conf.ext"
+							chown="root:root" chmod="0600" backup="true">
 							<content><![CDATA[
 # This file is commonly accessed via passdb {} or userdb {} section in
 # conf.d/auth-sql.conf.ext
@@ -3257,8 +3260,8 @@ mail_access_groups = vmail
 ]]>
 							</content>
 						</file>
-						<file name="/etc/dovecot/conf.d/10-master.conf" chown="root:0"
-							chmod="0644" backup="true">
+						<file name="/etc/dovecot/conf.d/10-master.conf"
+							chown="root:0" chmod="0644" backup="true">
 							<content><![CDATA[
 #default_process_limit = 100
 #default_client_limit = 1000
@@ -3580,8 +3583,8 @@ protocol imap {
 ]]>
 							</content>
 						</file>
-						<file name="/etc/dovecot/conf.d/20-managesieve.conf" chown="root:0"
-							chmod="0644" backup="true">
+						<file name="/etc/dovecot/conf.d/20-managesieve.conf"
+							chown="root:0" chmod="0644" backup="true">
 							<content><![CDATA[
 ##
 ## ManageSieve specific settings
@@ -3883,8 +3886,8 @@ plugin {
 					</commands>
 				</general>
 				<!-- Dovecot with postfix -->
-				<daemon name="dovecot_postfix" version="2" title="Dovecot with postfix"
-					default="true">
+				<daemon name="dovecot_postfix" version="2"
+					title="Dovecot with postfix" default="true">
 					<include>//service[@type='mail']/general/installs[@index=1]
 					</include>
 					<include>//service[@type='mail']/general/files[@index=1]
@@ -3898,7 +3901,8 @@ plugin {
 				<!-- Proftpd -->
 				<daemon name="proftpd" title="ProFTPd" default="true">
 					<install><![CDATA[apt-get install proftpd-basic proftpd-mod-mysql]]></install>
-					<file name="/etc/proftpd/create-cert.sh" chown="root:0" chmod="0700">
+					<file name="/etc/proftpd/create-cert.sh" chown="root:0"
+						chmod="0700">
 						<content><![CDATA[#!/bin/bash
 [ -f /etc/ssl/certs/proftpd.crt ] || openssl req -new -x509 -newkey rsa:4096 -days 3650 -nodes -out /etc/ssl/certs/proftpd.crt -keyout /etc/ssl/private/proftpd.key -subj "/C=US/ST=Some-State/O=Internet Widgits Pty Ltd/CN=<SERVERNAME>"
 [ -f /etc/ssl/certs/proftpd_ec.crt ] || openssl req -new -x509 -nodes -newkey ec:<(openssl ecparam -name secp521r1) -keyout /etc/ssl/private/proftpd_ec.key -out /etc/ssl/certs/proftpd_ec.crt -days 3650 -subj "/C=US/ST=Some-State/O=Internet Widgits Pty Ltd/CN=<SERVERNAME>"
@@ -3910,8 +3914,8 @@ chmod 0600 /etc/ssl/private/proftpd.key /etc/ssl/private/proftpd_ec.key
 						<command><![CDATA[/etc/proftpd/create-cert.sh]]></command>
 						<command><![CDATA[rm -f /etc/proftpd/create-cert.sh]]></command>
 					</commands>
-					<file name="/etc/proftpd/proftpd.conf" chown="root:0" chmod="0600"
-						backup="true">
+					<file name="/etc/proftpd/proftpd.conf" chown="root:0"
+						chmod="0600" backup="true">
 						<content><![CDATA[
 #
 # /etc/proftpd/proftpd.conf -- This is a basic ProFTPD configuration file.
@@ -4105,8 +4109,8 @@ Include /etc/proftpd/conf.d/
 ]]>
 						</content>
 					</file>
-					<file name="/etc/proftpd/modules.conf" chown="root:0" chmod="0644"
-						backup="true">
+					<file name="/etc/proftpd/modules.conf" chown="root:0"
+						chmod="0644" backup="true">
 						<content><![CDATA[
 #
 # This file is used to manage DSO modules and features.
@@ -4273,7 +4277,8 @@ SQLNamedQuery insert-quota-tally INSERT "%{0}, %{1}, %{2}, %{3}, %{4},%{5}, %{6}
 ]]>
 						</content>
 					</file>
-					<file name="/etc/proftpd/tls.conf" chown="root:root" chmod="0644" backup="true">
+					<file name="/etc/proftpd/tls.conf" chown="root:root"
+						chmod="0644" backup="true">
 						<content><![CDATA[
 <IfModule mod_tls.c>
 TLSEngine                               on
@@ -4305,14 +4310,15 @@ TLSVerifyClient                         off
 				<!-- Pureftpd -->
 				<daemon name="pureftpd" title="PureFTPd">
 					<install><![CDATA[apt-get install pure-ftpd-common pure-ftpd-mysql]]></install>
-					<file name="/etc/pure-ftpd/conf/MinUID" chown="root:0" chmod="0644">
+					<file name="/etc/pure-ftpd/conf/MinUID" chown="root:0"
+						chmod="0644">
 						<content><![CDATA[
 1000
 ]]>
 						</content>
 					</file>
-					<file name="/etc/pure-ftpd/conf/MySQLConfigFile" chown="root:0"
-						chmod="0644">
+					<file name="/etc/pure-ftpd/conf/MySQLConfigFile"
+						chown="root:0" chmod="0644">
 						<content><![CDATA[
 /etc/pure-ftpd/db/mysql.conf
 ]]>
@@ -4339,8 +4345,8 @@ yes
 ]]>
 						</content>
 					</file>
-					<file name="/etc/pure-ftpd/conf/PAMAuthentication" chown="root:0"
-						chmod="0644">
+					<file name="/etc/pure-ftpd/conf/PAMAuthentication"
+						chown="root:0" chmod="0644">
 						<content><![CDATA[
 no
 ]]>
@@ -4486,7 +4492,8 @@ MySQLGetQTASZ  SELECT panel_customers.diskspace/1024 AS QuotaSize FROM panel_cus
 ]]>
 						</content>
 					</file>
-					<file name="/etc/pure-ftpd/conf/Bind" chown="root:0" chmod="0644">
+					<file name="/etc/pure-ftpd/conf/Bind" chown="root:0"
+						chmod="0644">
 						<content><![CDATA[
 21
 ]]>
@@ -4530,7 +4537,8 @@ UPLOADGID=
 			<!-- System tools/services -->
 			<service type="system" title="{{lng.admin.configfiles.etc}}">
 				<!-- Cronjob -->
-				<daemon name="cron" title="Cronjob for froxlor" mandatory="true">
+				<daemon name="cron" title="Cronjob for froxlor"
+					mandatory="true">
 					<file name="/etc/cron.d/froxlor" chown="root:0" chmod="0640">
 						<content><![CDATA[
 #
@@ -4549,7 +4557,8 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 					<command><![CDATA[{{settings.system.crondreload}}]]></command>
 				</daemon>
 				<!-- AWstats -->
-				<daemon name="awstats" title="Awstats (webalizer alternative)">
+				<daemon name="awstats"
+					title="Awstats (webalizer alternative)">
 					<install><![CDATA[apt-get install awstats]]></install>
 					<command><![CDATA[cp /usr/share/awstats/tools/awstats_buildstaticpages.pl {{settings.system.awstats_path}}]]></command>
 					<command><![CDATA[mv {{settings.system.awstats_conf}}/awstats.conf {{settings.system.awstats_conf}}/awstats.model.conf]]></command>
@@ -4558,7 +4567,8 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 					<command><![CDATA[rm /etc/cron.d/awstats]]></command>
 				</daemon>
 				<!-- libnss-extrausers -->
-				<daemon name="libnssextrausers" title="libnss-extrausers (alternative to libnss-mysql, required for FCGID/php-fpm/mpm-itk)">
+				<daemon name="libnssextrausers"
+					title="libnss-extrausers (alternative to libnss-mysql, required for FCGID/php-fpm/mpm-itk)">
 					<install><![CDATA[apt-get install nscd libnss-extrausers]]></install>
 					<commands index="1">
 						<command><![CDATA[mkdir -p /var/lib/extrausers]]></command>
@@ -4598,7 +4608,8 @@ aliases:     files
 				<!-- Logrotate -->
 				<daemon name="logrotate" title="Logrotate">
 					<install><![CDATA[apt-get install logrotate]]></install>
-					<file name="/etc/logrotate.d/froxlor" chown="root:root" chmod="0644">
+					<file name="/etc/logrotate.d/froxlor" chown="root:root"
+						chmod="0644">
 						<content><![CDATA[
 #
 # Froxlor logrotate snipet
@@ -4633,12 +4644,13 @@ aliases:     files
 						<command><![CDATA[mkdir -p {{settings.system.mod_fcgid_tmpdir}}]]></command>
 						<command><![CDATA[a2dismod php7.0]]></command>
 					</commands>
-					<!-- instead of just restarting apache, we let the cronjob do all the
+					<!-- instead of just restarting apache, we let the cronjob do all the 
 						dirty work -->
 					<command><![CDATA[php {{const.\Froxlor\Froxlor::getInstallDir()}}/scripts/froxlor_master_cronjob.php --force]]></command>
 				</daemon>
 				<!-- PHP-FPM -->
-				<daemon name="php-fpm" title="PHP-FPM (alternative to mod_php)">
+				<daemon name="php-fpm"
+					title="PHP-FPM (alternative to mod_php)">
 					<install>
 						<visibility mode="equals" value="apache2">{{settings.system.webserver}}
 						</visibility>
@@ -4670,7 +4682,7 @@ aliases:     files
 						</visibility>
 						<command><![CDATA[/etc/init.d/apache2 restart]]></command>
 					</commands>
-					<!-- instead of just restarting apache, we let the cronjob do all the
+					<!-- instead of just restarting apache, we let the cronjob do all the 
 						dirty work -->
 					<command><![CDATA[php {{const.\Froxlor\Froxlor::getInstallDir()}}/scripts/froxlor_master_cronjob.php --force]]></command>
 				</daemon>