=== modified file 'README.rst' --- README.rst 2014-06-23 13:01:47 +0000 +++ README.rst 2014-02-14 19:20:50 +0000 @@ -90,9 +90,9 @@ * service generators (eg. foo.* instead of listing foo.1, foo.2,...) -* *DONE* more checks and event listeners (eg. rfkill, dhcpcd hook) - -* *DONE* pluggable hooks - -* *WIP* export better information what and when changed in configuration of - each service so they can be reloaded/restarted as needed +* more checks and event listeners (eg. rfkill, dhcpcd hook) + +* pluggable hooks + +* export better information what and when changed in configuration of each + service so they can be reloaded/restarted as needed === modified file 'zsh-functions/zsv_defaults_collectd' --- zsh-functions/zsv_defaults_collectd 2014-06-23 13:01:47 +0000 +++ zsh-functions/zsv_defaults_collectd 2014-06-22 21:59:00 +0000 @@ -1,16 +1,10 @@ run=(collectd -f) -configfile=/etc/collectd.conf - do_check() { zsv_check_unix /var/run/collectd/collectd-unixsock } checkf do_check zsv_run_collectd() { - if [[ -n $configfile ]]; then - args+=( -C $configfile ) - restart_files+=( $configfile ) - fi mkdir -p /var/run/collectd zsv_generic } === modified file 'zsh-functions/zsv_defaults_dhcpcd' --- zsh-functions/zsv_defaults_dhcpcd 2014-06-23 13:01:47 +0000 +++ zsh-functions/zsv_defaults_dhcpcd 2014-06-22 21:59:00 +0000 @@ -5,13 +5,3 @@ run=( dhcpcd --nobackground ) args=( $iface ) -configfile=/etc/dhcpcd.conf - -zsv_run_dhcpcd() { - if [[ -n $configfile ]]; then - args+=( --config $configfile ) - restart_files+=( $configfile ) - fi - zsv_generic -} -# vim: ft=zsh noet ts=4 sts=4 sw=4 === modified file 'zsh-functions/zsv_defaults_dnsmasq' --- zsh-functions/zsv_defaults_dnsmasq 2014-06-23 13:01:47 +0000 +++ zsh-functions/zsv_defaults_dnsmasq 2014-05-12 19:36:14 +0000 @@ -1,11 +1,2 @@ run=(dnsmasq --keep-in-foreground) -configfile=/etc/dnsmasq.conf - -zsv_run_dnsmasq() { - if [[ -n $configfile ]]; then - args+=( -C $configfile ) - restart_files+=( $configfile ) - fi - zsv_generic -} -# vim: ft=zsh noet ts=4 sts=4 sw=4 +# vim: ft=zsh === modified file 'zsh-functions/zsv_defaults_netplugd' --- zsh-functions/zsv_defaults_netplugd 2014-06-23 13:01:47 +0000 +++ zsh-functions/zsv_defaults_netplugd 2014-02-14 06:42:29 +0000 @@ -1,11 +1,1 @@ run=( /sbin/netplugd -F ) -configfile=/etc/netplug/netplugd.conf - -zsv_run_netplugd() { - if [[ -n $configfile ]]; then - args+=( -c $configfile ) - restart_files+=( $configfile ) - fi - zsv_generic -} -# vim: ft=zsh noet ts=4 sts=4 sw=4 === modified file 'zsh-functions/zsv_defaults_ntpd' --- zsh-functions/zsv_defaults_ntpd 2014-06-23 13:01:47 +0000 +++ zsh-functions/zsv_defaults_ntpd 2014-03-05 18:10:44 +0000 @@ -1,17 +1,6 @@ cond() { zsv_check_route } - run=( /usr/sbin/ntpd --nofork ) args=( --panicgate ) -configfile=/etc/ntp.conf - -zsv_run_ntpd() { - if [[ -n $configfile ]]; then - args+=( --configfile=$configfile ) - restart_files+=( $configfile ) - fi - zsv_generic -} - do_check() { zsv_check_udp '*:007B' } === modified file 'zsh-functions/zsv_defaults_openntpd' --- zsh-functions/zsv_defaults_openntpd 2014-06-23 13:01:47 +0000 +++ zsh-functions/zsv_defaults_openntpd 2014-02-18 02:46:00 +0000 @@ -1,13 +1,4 @@ check() { zsv_check_route } run=( /usr/sbin/ntpd -d ) args=( -s ) -configfile=/etc/ntpd.conf - -zsv_run_openntpd() { - if [[ -n $configfile ]]; then - args+=( -f $configfile ) - restart_files+=( $configfile ) - fi - zsv_generic -} # vim: ft=zsh noet ts=4 sts=4 sw=4 === modified file 'zsh-functions/zsv_defaults_sshd' --- zsh-functions/zsv_defaults_sshd 2014-06-23 13:01:47 +0000 +++ zsh-functions/zsv_defaults_sshd 2014-06-22 21:59:00 +0000 @@ -6,10 +6,6 @@ zsv_run_sshd() { ssh-keygen -A || exit $? - if [[ -n $configfile ]]; then - args+=( -f $configfile ) - reload_files+=( $configfile ) - fi zsv_generic } # vim: ft=zsh noet ts=4 sts=4 sw=4 === modified file 'zsh-functions/zsv_defaults_syslog-ng' --- zsh-functions/zsv_defaults_syslog-ng 2014-06-23 13:01:47 +0000 +++ zsh-functions/zsv_defaults_syslog-ng 2014-03-01 15:32:18 +0000 @@ -2,17 +2,9 @@ args=( --persist-file /var/lib/syslog-ng/syslog-ng.persist + --cfgfile /etc/syslog-ng/syslog-ng.conf --pidfile /var/run/syslog-ng.pid ) -configfile=/etc/syslog-ng/syslog-ng.conf - -zsv_run_syslog-ng() { - if [[ -n $configfile ]]; then - args+=( --cfgfile $configfile ) - reload_files+=( $configfile ) - fi - zsv_generic -} do_check() { zsv_check_unix /dev/log === modified file 'zsh-functions/zsv_defaults_wpa_cli' --- zsh-functions/zsv_defaults_wpa_cli 2014-06-23 13:01:47 +0000 +++ zsh-functions/zsv_defaults_wpa_cli 2014-06-22 21:59:00 +0000 @@ -6,4 +6,3 @@ -i ${iface} -P /var/run/wpa_cli-${iface}.pid ) -# vim: ft=zsh noet ts=4 sts=4 sw=4 === modified file 'zsh-functions/zsv_defaults_wpa_supplicant' --- zsh-functions/zsv_defaults_wpa_supplicant 2014-06-23 13:01:47 +0000 +++ zsh-functions/zsv_defaults_wpa_supplicant 2014-06-22 21:59:00 +0000 @@ -13,13 +13,4 @@ -i ${iface} -P /var/run/wpa_supplicant-${iface}.pid ) -configfile=/etc/wpa_supplicant/wpa_supplicant.conf - -zsv_run_wpa_supplicant() { - if [[ -n $configfile ]]; then - args+=( -c $configfile ) - reload_files+=( $configfile ) - fi - zsv_generic -} # vim: ft=zsh noet ts=4 sts=4 sw=4 === modified file 'zsh-functions/zsv_eval' --- zsh-functions/zsv_eval 2014-06-23 13:01:47 +0000 +++ zsh-functions/zsv_eval 2014-05-27 12:59:30 +0000 @@ -1,6 +1,6 @@ unset flags typeset -g -A flags handler -typeset -g -a run reload_files restart_files +typeset -g -a run typeset -g f_run f_log f_check if (( $# )); then === modified file 'zsh-functions/zsv_write_scriptnames' --- zsh-functions/zsv_write_scriptnames 2014-06-23 13:01:47 +0000 +++ zsh-functions/zsv_write_scriptnames 2014-06-20 17:09:43 +0000 @@ -10,19 +10,5 @@ fi done -print -rl - $restart_files $loaded $zsv_svtab >$zsv_dir/restart.files - -if [[ $run[1] == /* ]]; then - # absolute path - print -r - $run[1] >>$zsv_dir/run.files -elif (($+commands[$run[1]])); then - # command found in path - print -r - $+commands[$run[1]] >>$zsv_dir/restart.files -fi - -if (($#reload_files)); then - print -rl - $reload_files >>$zsv_dir/reload.files -elif [[ -e $zsv_dir/reload.files ]]; then - rm -f $zsv_dir/reload.files -fi +print -rl - $loaded >$zsv_dir/run.files # vim: ft=zsh noet ts=4 sts=4 sw=4