Merging my branch and d00ps branches to trunk

templates/misc/configfiles/suse_linux_10_0/awstats/etc_cron.d_awstats

@@ -1,6 +1,6 @@
-#
-# Set PATH, otherwise restart-scripts won't find start-stop-daemon
-#
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-
-*/10 * * * * www-data [ -x /usr/bin/awstats_updateall.pl ] && /usr/bin/awstats_updateall.pl now -awstatsprog=/usr/lib/cgi-bin/awstats.pl -configdir=/etc/awstats -excludeconf=awstats.model.conf.syscp,awstats.conf
+#
+# Set PATH, otherwise restart-scripts won't find start-stop-daemon
+#
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+
+*/10 * * * * www-data [ -x /usr/bin/awstats_updateall.pl ] && /usr/bin/awstats_updateall.pl now -awstatsprog=/usr/lib/cgi-bin/awstats.pl -configdir=/etc/awstats -excludeconf=awstats.model.conf.froxlor,awstats.conf

templates/misc/configfiles/suse_linux_10_0/awstats/etc_cron.d_awstats_log_sql

@@ -1,6 +1,6 @@
-#
-# Set PATH, otherwise restart-scripts won't find start-stop-daemon
-#
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-
-45 0 * * * www-data [ -x /usr/bin/awstats_updateall.pl ] && /usr/bin/awstats_updateall.pl now -awstatsprog=/usr/lib/cgi-bin/awstats.pl -configdir=/etc/awstats -excludeconf=awstats.model.conf.syscp,awstats.conf
+#
+# Set PATH, otherwise restart-scripts won't find start-stop-daemon
+#
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+
+45 0 * * * www-data [ -x /usr/bin/awstats_updateall.pl ] && /usr/bin/awstats_updateall.pl now -awstatsprog=/usr/lib/cgi-bin/awstats.pl -configdir=/etc/awstats -excludeconf=awstats.model.conf.froxlor,awstats.conf

templates/misc/configfiles/suse_linux_10_0/cron/etc_cron.d_froxlor

@@ -0,0 +1,14 @@
+#
+# Set PATH, otherwise restart-scripts won't find start-stop-daemon
+#
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+#
+# Regular cron jobs for the froxlor package
+#
+*/5 * * * *	root	/usr/bin/php5 -q /srv/www/htdocs/froxlor/scripts/cron_tasks.php
+0 0 * * *	root	/usr/bin/php5 -q /srv/www/htdocs/froxlor/scripts/cron_traffic.php
+30 0 * * *	root	/usr/bin/php5 -q /srv/www/htdocs/froxlor/scripts/cron_ticketarchive.php
+0 1 * * *	root	/usr/bin/php5 -q /var/www/htdocs/froxlor/scripts/cron_used_tickets_reset.php
+*/5 * * * *	root	/usr/bin/php5 -q /var/www/htdocs/froxlor/scripts/cron_autoresponder.php
+*/5 * * * *	root	/usr/bin/php5 -q /var/www/htdocs/froxlor/scripts/cron_apsinstaller.php
+*/30 * * * *	root	/usr/bin/php5 -q /var/www/htdocs/froxlor/scripts/cron_apsupdater.php

templates/misc/configfiles/suse_linux_10_0/cron/etc_cron.d_syscp

@@ -1,14 +0,0 @@
-#
-# Set PATH, otherwise restart-scripts won't find start-stop-daemon
-#
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-#
-# Regular cron jobs for the syscp package
-#
-*/5 * * * *	root	/usr/bin/php5 -q /srv/www/htdocs/syscp/scripts/cron_tasks.php
-0 0 * * *	root	/usr/bin/php5 -q /srv/www/htdocs/syscp/scripts/cron_traffic.php
-30 0 * * *	root	/usr/bin/php5 -q /srv/www/htdocs/syscp/scripts/cron_ticketarchive.php
-0 1 * * *	root	/usr/bin/php5 -q /var/www/htdocs/syscp/scripts/cron_used_tickets_reset.php
-*/5 * * * *	root	/usr/lib/php5 -q /var/www/htdocs/syscp/scripts/cron_autoresponder.php
-*/5 * * * *	root	/usr/lib/php5 -q /var/www/htdocs/syscp/scripts/cron_apsinstaller.php
-*/30 * * * *	root	/usr/lib/php5 -q /var/www/htdocs/syscp/scripts/cron_apsupdater.php

templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_alias_maps.cf

@@ -1,8 +1,8 @@
-user = <SQL_UNPRIVILEGED_USER>
-password = <SQL_UNPRIVILEGED_PASSWORD>
-dbname = <SQL_DB>
-table = mail_virtual
-select_field = destination
-where_field = email
-additional_conditions = and destination <> '' and destination <> ' '
-hosts = <SQL_HOST> 
+user = <SQL_UNPRIVILEGED_USER>
+password = <SQL_UNPRIVILEGED_PASSWORD>
+dbname = <SQL_DB>
+table = mail_virtual
+select_field = destination
+where_field = email
+additional_conditions = and TRIM(destination) <> ''
+hosts = <SQL_HOST>