[checkmk-commits] 5172 FIX Removed CRONTAB configuration option

Module: check_mk Branch: master Commit: 21b896a73a28f6652292758687e72105239da968 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21b896a73a28f6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 1 14:14:03 2017 +0200 5172 FIX Removed CRONTAB configuration option The crontab is a mandatory part of a Check_MK site which should never been disabled. For this reason we drop the configuration option now. Change-Id: I93a4170962ed808e97026d5b54f8c3f0e228db18 --- .werks/5170 | 2 +- .werks/5171 | 2 +- .werks/5172 | 11 +++++++++++ omd/packages/maintenance/CRONTAB.hook | 16 ---------------- omd/packages/maintenance/skel/etc/init.d/crontab | 3 --- 5 files changed, 13 insertions(+), 21 deletions(-) diff --git a/.werks/5170 b/.werks/5170 index d3f2e04..1d3d8be 100644 --- a/.werks/5170 +++ b/.werks/5170 @@ -1,4 +1,4 @@ -Title: Removed TMPFS config hook +Title: Removed TMPFS configuration option Level: 1 Component: omd Compatible: compat diff --git a/.werks/5171 b/.werks/5171 index f3939e6..343f468 100644 --- a/.werks/5171 +++ b/.werks/5171 @@ -1,4 +1,4 @@ -Title: Removed DEFAULT_GUI config +Title: Removed DEFAULT_GUI configuration option Level: 1 Component: omd Compatible: compat diff --git a/.werks/5172 b/.werks/5172 new file mode 100644 index 0000000..0829bef --- /dev/null +++ b/.werks/5172 @@ -0,0 +1,11 @@ +Title: Removed CRONTAB configuration option +Level: 1 +Component: omd +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1504268006 +Class: fix + +The crontab is a mandatory part of a Check_MK site which should never +been disabled. For this reason we drop the configuration option now. diff --git a/omd/packages/maintenance/CRONTAB.hook b/omd/packages/maintenance/CRONTAB.hook deleted file mode 100755 index 028df17..0000000 --- a/omd/packages/maintenance/CRONTAB.hook +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -# Alias: Initialize site crontab via etc/init.d/crontab -# Menu: Basic -# Description: -# Merge all files in etc/cron.d and initialize a site specific crontab. - -case "$1" in - default) - echo "on" - ;; - choices) - echo "on: Initialize site specific crontabs at boot time" - echo "off: Don´t create a site specific crontab" - ;; -esac diff --git a/omd/packages/maintenance/skel/etc/init.d/crontab b/omd/packages/maintenance/skel/etc/init.d/crontab index 517e816..0cce5b1 100644 --- a/omd/packages/maintenance/skel/etc/init.d/crontab +++ b/omd/packages/maintenance/skel/etc/init.d/crontab @@ -2,9 +2,6 @@ # # Start only if Crontab is enabled . ###ROOT###/etc/omd/site.conf -if [ "$CONFIG_CRONTAB" != on ] ; then - exit 5 -fi NAME="crontab" MERGECRONTABS="###ROOT###/bin/merge-crontabs"