zabbix
/
limosek-zaf
mirror of https://github.com/limosek/zaf.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Repaired plugin installation checks

1.2
Lukas Macura 2016-04-19 12:35:20 +02:00
parent 122c6fc831
commit b892cb067d
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ctrl.lib.sh
View File

@ -115,6 +115,7 @@ zaf_ctrl_sudo() {
pdir="$3"
plugin=$1
! [ -d "$ZAF_SUDOERSD" ] && zaf_wrn "$ZAF_SUDOERSD nonexistent! Skipping sudo install!"
zaf_dbg "Installing sudoers entry $ZAF_SUDOERSD/zaf_$plugin"
sudo=$(zaf_ctrl_get_global_option $2 "Sudo" | zaf_far '{PLUGINDIR}' "${plugindir}")
[ -z "$sudo" ] && return # Nothing to install
@ -142,6 +143,7 @@ zaf_ctrl_cron() {
pdir="$3"
plugin=$1
! [ -d "$ZAF_CROND" ] && zaf_wrn "$ZAF_CROND nonexistent! Skipping cron install!"
zaf_dbg "Installing cron entry $ZAF_CROND/zaf_$plugin"
cron=$(zaf_ctrl_get_global_option $2 "Cron")
[ -z "$cron" ] && return # Nothing to install

2
lib/zaf.lib.sh
View File

@ -296,12 +296,12 @@ zaf_install_plugin() {
control=${plugindir}/control.zaf
[ "$ZAF_DEBUG" -gt 1 ] && zaf_plugin_info "${control}"
zaf_ctrl_check_deps "${control}"
zaf_ctrl_install "$url" "${control}" "${plugindir}"
zaf_ctrl_sudo "$plugin" "${control}" "${plugindir}"
zaf_ctrl_cron "$plugin" "${control}" "${plugindir}"
zaf_ctrl_generate_cfg "${control}" "${plugin}" \
| zaf_far '{PLUGINDIR}' "${plugindir}" >${ZAF_AGENT_CONFIGD}/zaf_${plugin}.conf
zaf_dbg "Generated ${ZAF_AGENT_CONFIGD}/zaf_${plugin}.conf"
zaf_ctrl_install "$url" "${control}" "${plugindir}"
else
zaf_err "Cannot install plugin '$plugin' to $plugindir!"
fi