diff options
| -rw-r--r-- | alfred/files/alfred.config | 1 | ||||
| -rwxr-xr-x | alfred/files/alfred.init | 26 |
2 files changed, 20 insertions, 7 deletions
diff --git a/alfred/files/alfred.config b/alfred/files/alfred.config index b8fa9b2..9d3fff6 100644 --- a/alfred/files/alfred.config +++ b/alfred/files/alfred.config @@ -3,5 +3,6 @@ config 'alfred' 'alfred' option mode 'master' option batmanif 'bat0' option start_vis '1' + option run_facters '1' # REMOVE THIS LINE TO ENABLE ALFRED option disabled '1' diff --git a/alfred/files/alfred.init b/alfred/files/alfred.init index 56818d8..e52a7bd 100755 --- a/alfred/files/alfred.init +++ b/alfred/files/alfred.init @@ -11,6 +11,7 @@ START=99 STOP=99 alfred_args="" vis_args="" +facters_dir="/etc/alfred" pid_file_alfred="/var/run/alfred.pid" pid_file_vis="/var/run/vis.pid" enable=0 @@ -48,6 +49,8 @@ alfred_start() append vis_args "-i $batmanif -s" fi + config_get_bool run_facters "$section" run_facters 0 + return 0 } @@ -63,12 +66,20 @@ start() SERVICE_PID_FILE="$pid_file_alfred" service_start /usr/sbin/alfred ${alfred_args} - if [ "$vis_enable" = "0" ]; then - exit 0 - fi - echo "${initscript}: starting vis" - SERVICE_PID_FILE="$pid_file_vis" - service_start /usr/sbin/vis ${vis_args} + if [ "$vis_enable" = "1" ]; then + echo "${initscript}: starting vis" + SERVICE_PID_FILE="$pid_file_vis" + service_start /usr/sbin/vis ${vis_args} + fi + + if [ "$run_facters" = "1" ]; then + ( for file in $facters_dir/* ; do [ -x $file ] && $file ; done ) + if ! ( grep -q "for file in $facters_dir/\* ; do " /etc/crontabs/root 2>/dev/null ) ; then + echo "*/5 * * * * ( for file in $facters_dir/* ; do [ -x \$file ] && \$file ; done )" >> /etc/crontabs/root + /etc/init.d/cron enable + /etc/init.d/cron restart + fi + fi } stop() @@ -77,5 +88,6 @@ stop() service_stop /usr/sbin/alfred SERVICE_PID_FILE="$pid_file_vis" [ -x /usr/sbin/vis ] && service_stop /usr/sbin/vis - + sed "\|for file in $facters_dir/\* ; do |d" -i /etc/crontabs/root + /etc/init.d/cron restart } |