diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php index 9a6fae09..e99dfa3f 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -1206,6 +1206,7 @@ if(isFroxlorVersion('0.9.14-svn9')) showUpdateStep("Removing froxlor-clients table"); $db->query("DROP TABLE IF EXISTS `froxlor_clients`"); + lastStepStatus(0); updateToVersion('0.9.14-svn10'); } diff --git a/lib/configfiles/etch.inc.php b/lib/configfiles/etch.inc.php index ec1aa4a3..b0b29077 100644 --- a/lib/configfiles/etch.inc.php +++ b/lib/configfiles/etch.inc.php @@ -280,18 +280,6 @@ return Array( '/etc/init.d/cron restart' ) ), - 'xinetd' => Array( - 'label' => 'xinet.d (froxlor updates in realtime)', - 'commands' => Array( - 'apt-get install xinetd' - ), - 'files' => Array( - 'etc_xinetd.d_froxlor' => '/etc/xinetd.d/froxlor' - ), - 'restart' => Array( - '/etc/init.d/xinetd restart' - ) - ), 'awstats' => Array( 'label' => 'Awstats', 'commands' => Array( diff --git a/lib/configfiles/gentoo.inc.php b/lib/configfiles/gentoo.inc.php index 03c4f747..77a1166d 100644 --- a/lib/configfiles/gentoo.inc.php +++ b/lib/configfiles/gentoo.inc.php @@ -337,18 +337,6 @@ milter_default_action = accept" >> /etc/postfix/main.cf' '/etc/init.d/vixie-cron restart' ) ), - 'xinetd' => Array( - 'label' => 'xinet.d (froxlor updates in realtime)', - 'commands' => Array( - 'emerge -av xinetd' - ), - 'files' => Array( - 'etc_xinetd.d_froxlor' => '/etc/xinetd.d/froxlor' - ), - 'restart' => Array( - '/etc/init.d/xinetd restart' - ) - ), 'awstats' => Array( 'label' => 'Awstats', 'commands' => Array( diff --git a/lib/configfiles/hardy.inc.php b/lib/configfiles/hardy.inc.php index 6f1d3722..2ac923ba 100644 --- a/lib/configfiles/hardy.inc.php +++ b/lib/configfiles/hardy.inc.php @@ -318,18 +318,6 @@ return Array( '/etc/init.d/cron restart' ) ), - 'xinetd' => Array( - 'label' => 'xinet.d (froxlor updates in realtime)', - 'commands' => Array( - 'apt-get install xinetd' - ), - 'files' => Array( - 'etc_xinetd.d_froxlor' => '/etc/xinetd.d/froxlor' - ), - 'restart' => Array( - '/etc/init.d/xinetd restart' - ) - ), 'awstats' => Array( 'label' => 'Awstats', 'commands' => Array( diff --git a/lib/configfiles/lenny.inc.php b/lib/configfiles/lenny.inc.php index 7470586b..d945eb7d 100644 --- a/lib/configfiles/lenny.inc.php +++ b/lib/configfiles/lenny.inc.php @@ -323,18 +323,6 @@ return Array( '/etc/init.d/cron restart' ) ), - 'xinetd' => Array( - 'label' => 'xinet.d (froxlor updates in realtime)', - 'commands' => Array( - 'apt-get install xinetd' - ), - 'files' => Array( - 'etc_xinetd.d_froxlor' => '/etc/xinetd.d/froxlor' - ), - 'restart' => Array( - '/etc/init.d/xinetd restart' - ) - ), 'awstats' => Array( 'label' => 'Awstats', 'commands' => Array( diff --git a/lib/configfiles/lucid.inc.php b/lib/configfiles/lucid.inc.php index 2d8ba460..bb51275c 100644 --- a/lib/configfiles/lucid.inc.php +++ b/lib/configfiles/lucid.inc.php @@ -324,18 +324,6 @@ return Array( '/etc/init.d/cron restart' ) ), - 'xinetd' => Array( - 'label' => 'xinet.d (froxlor updates in realtime)', - 'commands' => Array( - 'apt-get install xinetd' - ), - 'files' => Array( - 'etc_xinetd.d_froxlor' => '/etc/xinetd.d/froxlor' - ), - 'restart' => Array( - '/etc/init.d/xinetd restart' - ) - ), 'awstats' => Array( 'label' => 'Awstats', 'commands' => Array( diff --git a/templates/misc/configfiles/debian_etch/xinetd/etc_xinetd.d_froxlor b/templates/misc/configfiles/debian_etch/xinetd/etc_xinetd.d_froxlor deleted file mode 100644 index 097d38cd..00000000 --- a/templates/misc/configfiles/debian_etch/xinetd/etc_xinetd.d_froxlor +++ /dev/null @@ -1,22 +0,0 @@ -service froxlor -{ - id = froxlor - socket_type = stream - protocol = tcp - wait = no - - user = root - server = /usr/bin/php - server_args = -q /var/www/froxlor/scripts/froxlor_master_cronjob.php - - bind = 127.0.0.1 - only_from = 127.0.0.1 - - type = UNLISTED - port = - disable = no - - log_type = SYSLOG daemon info - log_on_success = HOST DURATION - log_on_failure = HOST ATTEMPT -} diff --git a/templates/misc/configfiles/debian_lenny/xinetd/etc_xinetd.d_froxlor b/templates/misc/configfiles/debian_lenny/xinetd/etc_xinetd.d_froxlor deleted file mode 100644 index 4ef17fa2..00000000 --- a/templates/misc/configfiles/debian_lenny/xinetd/etc_xinetd.d_froxlor +++ /dev/null @@ -1,23 +0,0 @@ -service froxlor -{ - id = froxlor - socket_type = stream - protocol = tcp - wait = no - - user = root - server = /usr/bin/php - server_args = -q /var/www/froxlor/scripts/froxlor_master_cronjob.php - - bind = 127.0.0.1 - only_from = 127.0.0.1 - - type = UNLISTED - port = - disable = no - - log_type = SYSLOG daemon info - log_on_success = HOST DURATION - log_on_failure = HOST ATTEMPT -} - diff --git a/templates/misc/configfiles/gentoo/xinetd/etc_xinetd.d_froxlor b/templates/misc/configfiles/gentoo/xinetd/etc_xinetd.d_froxlor deleted file mode 100644 index 4ef17fa2..00000000 --- a/templates/misc/configfiles/gentoo/xinetd/etc_xinetd.d_froxlor +++ /dev/null @@ -1,23 +0,0 @@ -service froxlor -{ - id = froxlor - socket_type = stream - protocol = tcp - wait = no - - user = root - server = /usr/bin/php - server_args = -q /var/www/froxlor/scripts/froxlor_master_cronjob.php - - bind = 127.0.0.1 - only_from = 127.0.0.1 - - type = UNLISTED - port = - disable = no - - log_type = SYSLOG daemon info - log_on_success = HOST DURATION - log_on_failure = HOST ATTEMPT -} - diff --git a/templates/misc/configfiles/ubuntu_hardy/xinetd/etc_xinetd.d_froxlor b/templates/misc/configfiles/ubuntu_hardy/xinetd/etc_xinetd.d_froxlor deleted file mode 100644 index 4ef17fa2..00000000 --- a/templates/misc/configfiles/ubuntu_hardy/xinetd/etc_xinetd.d_froxlor +++ /dev/null @@ -1,23 +0,0 @@ -service froxlor -{ - id = froxlor - socket_type = stream - protocol = tcp - wait = no - - user = root - server = /usr/bin/php - server_args = -q /var/www/froxlor/scripts/froxlor_master_cronjob.php - - bind = 127.0.0.1 - only_from = 127.0.0.1 - - type = UNLISTED - port = - disable = no - - log_type = SYSLOG daemon info - log_on_success = HOST DURATION - log_on_failure = HOST ATTEMPT -} - diff --git a/templates/misc/configfiles/ubuntu_lucid/xinetd/etc_xinetd.d_froxlor b/templates/misc/configfiles/ubuntu_lucid/xinetd/etc_xinetd.d_froxlor deleted file mode 100644 index 4ef17fa2..00000000 --- a/templates/misc/configfiles/ubuntu_lucid/xinetd/etc_xinetd.d_froxlor +++ /dev/null @@ -1,23 +0,0 @@ -service froxlor -{ - id = froxlor - socket_type = stream - protocol = tcp - wait = no - - user = root - server = /usr/bin/php - server_args = -q /var/www/froxlor/scripts/froxlor_master_cronjob.php - - bind = 127.0.0.1 - only_from = 127.0.0.1 - - type = UNLISTED - port = - disable = no - - log_type = SYSLOG daemon info - log_on_success = HOST DURATION - log_on_failure = HOST ATTEMPT -} -