Merge branch 'master' of git://github.com/Froxlor/Froxlor

2013-10-10 17:01:01 +02:00
parent 553eca9b29 6a76e8a53f
commit 0651238e41
184 changed files with 7011 additions and 6352 deletions
--- a/templates/misc/configfiles/debian_squeeze/apache2/etc_apache2_mods-enabled_fastcgi.conf
+++ b/templates/misc/configfiles/debian_squeeze/apache2/etc_apache2_mods-enabled_fastcgi.conf
@@ -1,5 +1,4 @@
 <IfModule mod_fastcgi.c>
-    FastCgiWrapper /usr/lib/apache2/suexec
    FastCgiIpcDir /var/run/apache2/

    <Location "/fastcgiphp">
--- a/templates/misc/configfiles/debian_squeeze/cron/etc_cron.d_froxlor
+++ b/templates/misc/configfiles/debian_squeeze/cron/etc_cron.d_froxlor
@@ -5,4 +5,4 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 #
 # Regular cron jobs for the froxlor package
 #
-*/5 * * * *	root	/usr/bin/nice -n 5	/usr/bin/php5 -q <BASE_PATH>scripts/froxlor_master_cronjob.php
+*/5 * * * *	root	/usr/bin/nice -n 5 /usr/bin/php5 -q <BASE_PATH>scripts/froxlor_master_cronjob.php
--- a/templates/misc/configfiles/debian_squeeze/logrotate/etc_logrotated_froxlor
+++ b/templates/misc/configfiles/debian_squeeze/logrotate/etc_logrotated_froxlor
@@ -0,0 +1,16 @@
+#
+# Froxlor logrotate snipet
+#
+<CUSTOMER_LOGS>*.log {
+  missingok
+  weekly
+  rotate 4
+  compress
+  delaycompress
+  notifempty
+  create
+  sharedscripts
+  postrotate
+  <WEBSERVER_RELOAD_CMD> > /dev/null 2>&1 || true
+  endscript
+}
--- a/templates/misc/configfiles/debian_wheezy/apache2/etc_apache2_mods-enabled_fastcgi.conf
+++ b/templates/misc/configfiles/debian_wheezy/apache2/etc_apache2_mods-enabled_fastcgi.conf
@@ -1,5 +1,4 @@
 <IfModule mod_fastcgi.c>
-    FastCgiWrapper /usr/lib/apache2/suexec
    FastCgiIpcDir /var/run/apache2/

    <Location "/fastcgiphp">
--- a/templates/misc/configfiles/debian_wheezy/cron/etc_cron.d_froxlor
+++ b/templates/misc/configfiles/debian_wheezy/cron/etc_cron.d_froxlor
@@ -5,4 +5,4 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 #
 # Regular cron jobs for the froxlor package
 #
-*/5 * * * *	root	/usr/bin/nice -n 5	/usr/bin/php5 -q <BASE_PATH>scripts/froxlor_master_cronjob.php
+*/5 * * * *	root	/usr/bin/nice -n 5 /usr/bin/php5 -q <BASE_PATH>scripts/froxlor_master_cronjob.php
--- a/templates/misc/configfiles/debian_wheezy/logrotate/etc_logrotated_froxlor
+++ b/templates/misc/configfiles/debian_wheezy/logrotate/etc_logrotated_froxlor
@@ -0,0 +1,16 @@
+#
+# Froxlor logrotate snipet
+#
+<CUSTOMER_LOGS>*.log {
+  missingok
+  weekly
+  rotate 4
+  compress
+  delaycompress
+  notifempty
+  create
+  sharedscripts
+  postrotate
+  <WEBSERVER_RELOAD_CMD> > /dev/null 2>&1 || true
+  endscript
+}
--- a/templates/misc/configfiles/debian_wheezy/proftpd/etc_proftpd_modules.conf
+++ b/templates/misc/configfiles/debian_wheezy/proftpd/etc_proftpd_modules.conf
@@ -59,7 +59,7 @@ LoadModule mod_quotatab_file.c

 # Install one of the previous SQL backends and decomment 
 # the previous mod_sql.c module to use this
-#LoadModule mod_quotatab_sql.c
+LoadModule mod_quotatab_sql.c
 LoadModule mod_quotatab_radius.c
 LoadModule mod_wrap.c
 LoadModule mod_rewrite.c
--- a/templates/misc/configfiles/freebsd/logrotate/etc_logrotated_froxlor
+++ b/templates/misc/configfiles/freebsd/logrotate/etc_logrotated_froxlor
@@ -0,0 +1,16 @@
+#
+# Froxlor logrotate snipet
+#
+<CUSTOMER_LOGS>*.log {
+  missingok
+  weekly
+  rotate 4
+  compress
+  delaycompress
+  notifempty
+  create
+  sharedscripts
+  postrotate
+  <WEBSERVER_RELOAD_CMD> > /dev/null 2>&1 || true
+  endscript
+}
--- a/templates/misc/configfiles/gentoo/apache2/etc_apache2_modules.d_70_fastcgi.conf
+++ b/templates/misc/configfiles/gentoo/apache2/etc_apache2_modules.d_70_fastcgi.conf
@@ -1,5 +1,4 @@
 <IfModule mod_fastcgi.c>
-    FastCgiWrapper /usr/sbin/suexec
    FastCgiIpcDir /var/run/apache2/

    <Location "/fastcgiphp">
--- a/templates/misc/configfiles/gentoo/cron/etc_cron.d_froxlor
+++ b/templates/misc/configfiles/gentoo/cron/etc_cron.d_froxlor
@@ -7,4 +7,4 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
 #
 # Please check that all following paths are correct
 #
-*/5 * * * *	root	/usr/bin/nice -n 5	/usr/bin/php -q <BASE_PATH>scripts/froxlor_master_cronjob.php
+*/5 * * * *	root	/usr/bin/nice -n 5 /usr/bin/php -q <BASE_PATH>scripts/froxlor_master_cronjob.php
--- a/templates/misc/configfiles/gentoo/logrotate/etc_logrotated_froxlor
+++ b/templates/misc/configfiles/gentoo/logrotate/etc_logrotated_froxlor
@@ -0,0 +1,16 @@
+#
+# Froxlor logrotate snipet
+#
+<CUSTOMER_LOGS>*.log {
+  missingok
+  weekly
+  rotate 4
+  compress
+  delaycompress
+  notifempty
+  create
+  sharedscripts
+  postrotate
+  <WEBSERVER_RELOAD_CMD> > /dev/null 2>&1 || true
+  endscript
+}
--- a/templates/misc/configfiles/opensuse_11_x/cron/etc_cron.d_froxlor
+++ b/templates/misc/configfiles/opensuse_11_x/cron/etc_cron.d_froxlor
@@ -5,4 +5,4 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
 #
 # Regular cron jobs for the froxlor package
 #
-*/5 * * * *	root	/usr/bin/nice -n 5	/usr/bin/php5 -q /srv/www/froxlor/scripts/froxlor_master_cronjob.php
+*/5 * * * *	root	/usr/bin/nice -n 5 /usr/bin/php5 -q /srv/www/froxlor/scripts/froxlor_master_cronjob.php
--- a/templates/misc/configfiles/sle_10/cron/etc_cron.d_froxlor
+++ b/templates/misc/configfiles/sle_10/cron/etc_cron.d_froxlor
@@ -5,4 +5,4 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 #
 # Regular cron jobs for the froxlor package
 #
-*/5 * * * *	root	/usr/bin/nice -n 5	/usr/bin/php5 -q <BASE_PATH>scripts/froxlor_master_cronjob.php
+*/5 * * * *	root	/usr/bin/nice -n 5 /usr/bin/php5 -q <BASE_PATH>scripts/froxlor_master_cronjob.php
--- a/templates/misc/configfiles/ubuntu_lucid/apache2/etc_apache2_mods-enabled_fastcgi.conf
+++ b/templates/misc/configfiles/ubuntu_lucid/apache2/etc_apache2_mods-enabled_fastcgi.conf
@@ -1,5 +1,4 @@
 <IfModule mod_fastcgi.c>
-    FastCgiWrapper /usr/lib/apache2/suexec
    FastCgiIpcDir /var/run/apache2/

    <Location "/fastcgiphp">
--- a/templates/misc/configfiles/ubuntu_lucid/cron/etc_cron.d_froxlor
+++ b/templates/misc/configfiles/ubuntu_lucid/cron/etc_cron.d_froxlor
@@ -5,4 +5,4 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 #
 # Regular cron jobs for the froxlor package
 #
-*/5 * * * *	root	/usr/bin/nice -n 5	/usr/bin/php5 -q <BASE_PATH>scripts/froxlor_master_cronjob.php
+*/5 * * * *	root	/usr/bin/nice -n 5 /usr/bin/php5 -q <BASE_PATH>scripts/froxlor_master_cronjob.php
--- a/templates/misc/configfiles/ubuntu_lucid/logrotate/etc_logrotated_froxlor
+++ b/templates/misc/configfiles/ubuntu_lucid/logrotate/etc_logrotated_froxlor
@@ -0,0 +1,16 @@
+#
+# Froxlor logrotate snipet
+#
+<CUSTOMER_LOGS>*.log {
+  missingok
+  weekly
+  rotate 4
+  compress
+  delaycompress
+  notifempty
+  create
+  sharedscripts
+  postrotate
+  <WEBSERVER_RELOAD_CMD> > /dev/null 2>&1 || true
+  endscript
+}
--- a/templates/misc/configfiles/ubuntu_precise/apache2/etc_apache2_mods-enabled_fastcgi.conf
+++ b/templates/misc/configfiles/ubuntu_precise/apache2/etc_apache2_mods-enabled_fastcgi.conf
@@ -1,5 +1,4 @@
 <IfModule mod_fastcgi.c>
-    FastCgiWrapper /usr/lib/apache2/suexec
    FastCgiIpcDir /var/run/apache2/

    <Location "/fastcgiphp">
--- a/templates/misc/configfiles/ubuntu_precise/cron/etc_cron.d_froxlor
+++ b/templates/misc/configfiles/ubuntu_precise/cron/etc_cron.d_froxlor
@@ -5,4 +5,4 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 #
 # Regular cron jobs for the froxlor package
 #
-*/5 * * * *	root	/usr/bin/nice -n 5	/usr/bin/php5 -q <BASE_PATH>scripts/froxlor_master_cronjob.php
+*/5 * * * *	root	/usr/bin/nice -n 5 /usr/bin/php5 -q <BASE_PATH>scripts/froxlor_master_cronjob.php
--- a/templates/misc/configfiles/ubuntu_precise/logrotate/etc_logrotated_froxlor
+++ b/templates/misc/configfiles/ubuntu_precise/logrotate/etc_logrotated_froxlor
@@ -0,0 +1,16 @@
+#
+# Froxlor logrotate snipet
+#
+<CUSTOMER_LOGS>*.log {
+  missingok
+  weekly
+  rotate 4
+  compress
+  delaycompress
+  notifempty
+  create
+  sharedscripts
+  postrotate
+  <WEBSERVER_RELOAD_CMD> > /dev/null 2>&1 || true
+  endscript
+}