From 26d9d0ab5571a26bc075d0b95a358aa624634acf Mon Sep 17 00:00:00 2001 From: Lukas Macura Date: Fri, 9 Dec 2016 13:20:46 +0100 Subject: [PATCH] Url to plugins points to right branch --- README.md | 4 ++-- install.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 39e3dfb..acdc2b6 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ wget --no-check-certificate -O - https://raw.githubusercontent.com/limosek/zaf/1 ``` If you do not have https support (like openwrt), I made small http mirror of github files which is synchronized each day: ``` -wget -O - http://github.macura.cz/zaf/1.3/install.sh| ZAF_URL=http://github.macura.cz/zaf/ ZAF_REPO_URL=http://github.macura.cz/zaf-plugins/ sh +wget -O - http://github.macura.cz/zaf/1.3/install.sh| ZAF_URL=http://github.macura.cz/zaf/ ZAF_REPO_URL=http://github.macura.cz/zaf-plugins/1.3/ sh ``` ### Install options and autoconfiguration @@ -74,7 +74,7 @@ ZAF_CACHE_DIR|Cache directory|/tmp/zafc ZAF_LIB_DIR|Libraries directory|/usr/lib/zaf ZAF_PLUGINS_DIR|Plugins directory|${ZAF_LIB_DIR}/plugins ZAF_PROXY|http[s] and ftp proxy used by zaf|empty -ZAF_REPO_URL|Plugins http[s] repository|https://raw.githubusercontent.com/limosek/zaf-plugins/master/ +ZAF_REPO_URL|Plugins http[s] repository|https://raw.githubusercontent.com/limosek/zaf-plugins/1.3/ ZAF_REPO_DIR|Plugins directory|${ZAF_LIB_DIR}/repo ZAF_AGENT_CONFIG|Zabbix agent config|/etc/zabbix/zabbix_agentd.conf ZAF_AGENT_CONFIGD|Zabbix agent config.d|/etc/zabbix/zabbix_agentd.conf.d/ diff --git a/install.sh b/install.sh index f2f7eeb..a8ab5ce 100755 --- a/install.sh +++ b/install.sh @@ -267,7 +267,7 @@ zaf_configure(){ zaf_get_option ZAF_PLUGINS_DIR "Plugins directory" "${ZAF_LIB_DIR}/plugins" "$INSTALL_MODE" [ "${ZAF_GIT}" = 1 ] && zaf_get_option ZAF_REPO_GITURL "Git plugins repository" "https://github.com/limosek/zaf-plugins.git" "$INSTALL_MODE" zaf_get_option ZAF_PROXY "http proxy used by zaf" "" "$INSTALL_MODE" - zaf_get_option ZAF_REPO_URL "Plugins http[s] repository" "https://raw.githubusercontent.com/limosek/zaf-plugins/master/" "$INSTALL_MODE" + zaf_get_option ZAF_REPO_URL "Plugins http[s] repository" "https://raw.githubusercontent.com/limosek/zaf-plugins/${ZAF_VERSION}/" "$INSTALL_MODE" zaf_get_option ZAF_REPO_DIR "Plugins directory" "${ZAF_LIB_DIR}/repo" "$INSTALL_MODE" zaf_get_option ZAF_AGENT_CONFIG "Zabbix agent config" "/etc/zabbix/zabbix_agentd.conf" "$INSTALL_MODE"