From 475e2bf73573318541469d6a26433bb78e4dda6a Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Sun, 6 Oct 2013 11:36:34 +0200 Subject: [PATCH] provide full path to 'nice'-executable in cron-configuration-templates, fixes #1272 Signed-off-by: Michael Kaufmann (d00p) --- install/froxlor.sql | 2 +- .../misc/configfiles/debian_squeeze/cron/etc_cron.d_froxlor | 2 +- .../misc/configfiles/debian_wheezy/cron/etc_cron.d_froxlor | 2 +- templates/misc/configfiles/gentoo/cron/etc_cron.d_froxlor | 2 +- .../misc/configfiles/opensuse_11_x/cron/etc_cron.d_froxlor | 2 +- templates/misc/configfiles/sle_10/cron/etc_cron.d_froxlor | 2 +- templates/misc/configfiles/ubuntu_lucid/cron/etc_cron.d_froxlor | 2 +- .../misc/configfiles/ubuntu_precise/cron/etc_cron.d_froxlor | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/install/froxlor.sql b/install/froxlor.sql index d551794d..a21183e7 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -264,7 +264,7 @@ CREATE TABLE `panel_ipsandports` ( `namevirtualhost_statement` tinyint(1) NOT NULL default '0', `vhostcontainer` tinyint(1) NOT NULL default '0', `vhostcontainer_servername_statement` tinyint(1) NOT NULL default '0', - `specialsettings` text NOT NULL, + `specialsettings` text NOT NULL default '', `ssl` tinyint(4) NOT NULL default '0', `ssl_cert_file` varchar(255) NOT NULL, `ssl_key_file` varchar(255) NOT NULL, diff --git a/templates/misc/configfiles/debian_squeeze/cron/etc_cron.d_froxlor b/templates/misc/configfiles/debian_squeeze/cron/etc_cron.d_froxlor index 86a93796..1c972c11 100644 --- 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 nice -n 5 /usr/bin/php5 -q scripts/froxlor_master_cronjob.php +*/5 * * * * root /usr/bin/nice -n 5 /usr/bin/php5 -q scripts/froxlor_master_cronjob.php diff --git a/templates/misc/configfiles/debian_wheezy/cron/etc_cron.d_froxlor b/templates/misc/configfiles/debian_wheezy/cron/etc_cron.d_froxlor index 86a93796..1c972c11 100644 --- 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 nice -n 5 /usr/bin/php5 -q scripts/froxlor_master_cronjob.php +*/5 * * * * root /usr/bin/nice -n 5 /usr/bin/php5 -q scripts/froxlor_master_cronjob.php diff --git a/templates/misc/configfiles/gentoo/cron/etc_cron.d_froxlor b/templates/misc/configfiles/gentoo/cron/etc_cron.d_froxlor index da444fed..f468354f 100644 --- 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 nice -n 5 /usr/bin/php -q scripts/froxlor_master_cronjob.php +*/5 * * * * root /usr/bin/nice -n 5 /usr/bin/php -q scripts/froxlor_master_cronjob.php diff --git a/templates/misc/configfiles/opensuse_11_x/cron/etc_cron.d_froxlor b/templates/misc/configfiles/opensuse_11_x/cron/etc_cron.d_froxlor index ee8dd791..5913b2df 100644 --- 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/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 diff --git a/templates/misc/configfiles/sle_10/cron/etc_cron.d_froxlor b/templates/misc/configfiles/sle_10/cron/etc_cron.d_froxlor index 86a93796..1c972c11 100644 --- 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 nice -n 5 /usr/bin/php5 -q scripts/froxlor_master_cronjob.php +*/5 * * * * root /usr/bin/nice -n 5 /usr/bin/php5 -q scripts/froxlor_master_cronjob.php diff --git a/templates/misc/configfiles/ubuntu_lucid/cron/etc_cron.d_froxlor b/templates/misc/configfiles/ubuntu_lucid/cron/etc_cron.d_froxlor index 86a93796..1c972c11 100644 --- 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 nice -n 5 /usr/bin/php5 -q scripts/froxlor_master_cronjob.php +*/5 * * * * root /usr/bin/nice -n 5 /usr/bin/php5 -q scripts/froxlor_master_cronjob.php diff --git a/templates/misc/configfiles/ubuntu_precise/cron/etc_cron.d_froxlor b/templates/misc/configfiles/ubuntu_precise/cron/etc_cron.d_froxlor index 86a93796..1c972c11 100644 --- 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 nice -n 5 /usr/bin/php5 -q scripts/froxlor_master_cronjob.php +*/5 * * * * root /usr/bin/nice -n 5 /usr/bin/php5 -q scripts/froxlor_master_cronjob.php