1
0
mirror of https://github.com/limosek/zaf.git synced 2024-11-24 03:19:05 +01:00

Repaired urls to work with 1.0

This commit is contained in:
Lukas Macura 2016-04-07 13:43:36 +02:00
parent 224dc441e3
commit 57f2edb9f5
2 changed files with 8 additions and 8 deletions

View File

@ -26,18 +26,18 @@ So zaf is here for you :)
## Installing Zaf ## Installing Zaf
You need to be root and you must have curl installed on your system. Depending on your system, github certificates may not be available so you have to use *-k* option for curl (insecure). Default installation type is silent. So there will be no questions and everything will be autodetected. This simple command should be used on most systems: You need to be root and you must have curl installed on your system. Depending on your system, github certificates may not be available so you have to use *-k* option for curl (insecure). Default installation type is silent. So there will be no questions and everything will be autodetected. This simple command should be used on most systems:
``` ```
curl -k https://raw.githubusercontent.com/limosek/zaf/master/install.sh | sh curl -k https://raw.githubusercontent.com/limosek/zaf/1.0/install.sh | sh
``` ```
### Install options and autoconfiguration ### Install options and autoconfiguration
General parameters for install.sh on any system (simplest way how to install) General parameters for install.sh on any system (simplest way how to install)
``` ```
curl -k https://raw.githubusercontent.com/limosek/zaf/master/install.sh | \ curl -k https://raw.githubusercontent.com/limosek/zaf/1.0/install.sh | \
sh -s {auto|interactive|debug-auto|debug-interactive} [Agent-Options] [Zaf-Options] sh -s {auto|interactive|debug-auto|debug-interactive} [Agent-Options] [Zaf-Options]
``` ```
or use git version: or use git version:
``` ```
git clone https://github.com/limosek/zaf.git git clone https://github.com/limosek/zaf.git; cd zaf; git checkout 1.0
./install.sh {auto|interactive|debug-auto|debug-interactive} [Agent-Options] [Zaf-Options] ./install.sh {auto|interactive|debug-auto|debug-interactive} [Agent-Options] [Zaf-Options]
Agent-Options: A_Option=value [...] Agent-Options: A_Option=value [...]
Zaf-Options: ZAF_OPT=value [...] Zaf-Options: ZAF_OPT=value [...]
@ -52,7 +52,7 @@ Now everything was tested on Debian and OpenWrt. If somebody is interrested in,
Suppose you want to autoinstall agent on clean system. You need only curl installed. Everything else is one-cmd process. Suppose you want to autoinstall agent on clean system. You need only curl installed. Everything else is one-cmd process.
This command will install zaf, install zabbix-agent if necessary and sets zabbix variables on agent to reach server. This command can be automatized by puppet or another deploying system. This command will install zaf, install zabbix-agent if necessary and sets zabbix variables on agent to reach server. This command can be automatized by puppet or another deploying system.
``` ```
curl -k https://raw.githubusercontent.com/limosek/zaf/master/install.sh | sh -s auto \ curl -k https://raw.githubusercontent.com/limosek/zaf/1.0/install.sh | sh -s auto \
Z_Server=zabbix.server.local \ Z_Server=zabbix.server.local \
Z_ServerActive=zabbix.server.local \ Z_ServerActive=zabbix.server.local \
Z_HostnameItem=system.hostname Z_RefreshActiveChecks=60 \ Z_HostnameItem=system.hostname Z_RefreshActiveChecks=60 \
@ -60,9 +60,9 @@ curl -k https://raw.githubusercontent.com/limosek/zaf/master/install.sh | sh -s
``` ```
### Packaged version ### Packaged version
You can make your own deb package with preconfigured option. It is up to you to put it to right repository and install. You can make your own deb package with preconfigured option. It is up to you to put it to right APT repository and install.
``` ```
git clone https://github.com/limosek/zaf.git git clone https://github.com/limosek/zaf.git; cd zaf; git checkout 1.0; cd ..
git clone https://github.com/limosek/zaf-plugins.git git clone https://github.com/limosek/zaf-plugins.git
cd zaf && make deb PLUGINS="$PWD/../zaf-plugins/zaf $PWD/../zaf-plugins/fsx" ZAF_OPTIONS="ZAF_GIT=0" AGENT_OPTIONS="Z_Server=zabbix.server Z_ServerActive=zabbix.server Z_StartAgents=8" cd zaf && make deb PLUGINS="$PWD/../zaf-plugins/zaf $PWD/../zaf-plugins/fsx" ZAF_OPTIONS="ZAF_GIT=0" AGENT_OPTIONS="Z_Server=zabbix.server Z_ServerActive=zabbix.server Z_StartAgents=8"
sudo dpkg -i out/zaf.deb sudo dpkg -i out/zaf.deb

View File

@ -2,7 +2,7 @@
if [ -z "$ZAF_URL" ]; then if [ -z "$ZAF_URL" ]; then
# Runing as standalone install.sh. We have to download rest of files first. # Runing as standalone install.sh. We have to download rest of files first.
[ -z "$ZAF_VERSION" ] && ZAF_VERSION=master [ -z "$ZAF_VERSION" ] && ZAF_VERSION=1.0
ZAF_URL="https://github.com/limosek/zaf/" ZAF_URL="https://github.com/limosek/zaf/"
fi fi
@ -19,7 +19,7 @@ zaf_fetch_url(){
# Download tgz and extract to /tmp/zaf-installer # Download tgz and extract to /tmp/zaf-installer
zaf_download_files() { zaf_download_files() {
rm -rf /tmp/zaf-installer rm -rf /tmp/zaf-installer
zaf_fetch_url $ZAF_URL/archive/$ZAF_VERSION.tar.gz | tar -C /tmp -zx && mv /tmp/zaf-$ZAF_VERSION /tmp/zaf-installer zaf_fetch_url $ZAF_URL/archive/$ZAF_VERSION.tar.gz | tar -f - -C /tmp -zx && mv /tmp/zaf-$ZAF_VERSION /tmp/zaf-installer
} }
if ! [ -f README.md ]; then if ! [ -f README.md ]; then