zabbix/limosek-zaf
1
0
Fork 0
mirror of https://github.com/limosek/zaf.git synced 2024-11-23 10:59:06 +01:00
Code Issues Releases Wiki Activity

Self-upgrade now remebers zabbix options entered during first install

Browse Source
This commit is contained in:
Lukas Macura 2016-04-05 13:14:45 +02:00
parent 63feeb1b1d
commit 7eea6896e1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
install.sh
View File

@ -123,6 +123,7 @@ zaf_configure_agent() {
local pair local pair
local option local option
local value local value
local options
zaf_install_dir "$ZAF_AGENT_CONFIGD" zaf_install_dir "$ZAF_AGENT_CONFIGD"
echo -n >"$ZAF_AGENT_CONFIGD/zaf_options.conf" || zaf_err "Cannot access $ZAF_AGENT_CONFIGD/zaf_options.conf" echo -n >"$ZAF_AGENT_CONFIGD/zaf_options.conf" || zaf_err "Cannot access $ZAF_AGENT_CONFIGD/zaf_options.conf"
@ -131,7 +132,9 @@ zaf_configure_agent() {
option=$(echo $pair|cut -d '=' -f 1|cut -d '_' -f 2) option=$(echo $pair|cut -d '=' -f 1|cut -d '_' -f 2)
value=$(echo $pair|cut -d '=' -f 2-) value=$(echo $pair|cut -d '=' -f 2-)
zaf_set_agent_option "$option" "$value" zaf_set_agent_option "$option" "$value"
options="$options Z_$option='$value'"
done done
zaf_set_option ZAF_AGENT_OPTIONS "${options}"
} }
zaf_configure(){ zaf_configure(){
@ -145,6 +148,7 @@ zaf_configure(){
zaf_get_option ZAF_OS "Operating system to use" "$ZAF_OS" "$1" zaf_get_option ZAF_OS "Operating system to use" "$ZAF_OS" "$1"
zaf_get_option ZAF_OS_CODENAME "Operating system codename" "$ZAF_OS_CODENAME" "$1" zaf_get_option ZAF_OS_CODENAME "Operating system codename" "$ZAF_OS_CODENAME" "$1"
zaf_get_option ZAF_AGENT_PKG "Zabbix agent package" "$ZAF_AGENT_PKG" "$1" zaf_get_option ZAF_AGENT_PKG "Zabbix agent package" "$ZAF_AGENT_PKG" "$1"
zaf_get_option ZAF_AGENT_OPTIONS "Zabbix options to set in cfg" "$ZAF_AGENT_OPTIONS" "$1"
if zaf_is_root && [ -n "$ZAF_AGENT_PKG" ]; then if zaf_is_root && [ -n "$ZAF_AGENT_PKG" ]; then
if ! zaf_os_specific zaf_check_deps "$ZAF_AGENT_PKG"; then if ! zaf_os_specific zaf_check_deps "$ZAF_AGENT_PKG"; then
if [ "$1" = "auto" ]; then if [ "$1" = "auto" ]; then
@ -235,7 +239,7 @@ reconf)
;; ;;
install) install)
zaf_configure auto zaf_configure auto
zaf_configure_agent "$@" zaf_configure_agent $ZAF_AGENT_OPTIONS "$@"
zaf_set_agent_option "Include" "$ZAF_AGENT_CONFIGD" append zaf_set_agent_option "Include" "$ZAF_AGENT_CONFIGD" append
rm -rif ${ZAF_TMP_DIR} rm -rif ${ZAF_TMP_DIR}
mkdir -p ${ZAF_TMP_DIR} mkdir -p ${ZAF_TMP_DIR}