From aa89808dcf5347a3ca00e11c39746964633960db Mon Sep 17 00:00:00 2001
From: xiaoz <xiaoz93@outlook.com>
Date: Mon, 4 Dec 2017 22:20:24 +0800
Subject: [PATCH] update

---
 zabbix_agent.sh | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)
 mode change 100644 => 100755 zabbix_agent.sh

diff --git a/zabbix_agent.sh b/zabbix_agent.sh
old mode 100644
new mode 100755
index a62256d..41dfb5e
--- a/zabbix_agent.sh
+++ b/zabbix_agent.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #####		一键安装Zabbix agent		#####
-#####		Update:2017-11-30			#####
+#####		Update:2017-12-04			#####
 #####		Author:xiaoz.me				#####
 
 #获取主机名
@@ -11,20 +11,20 @@ osip=$(curl http://https.tn/ip/myip.php?type=onlyip)
 zabbix_config="/etc/zabbix/zabbix_agentd.conf"
 
 #配置zabbix agent
-function setting($hostname,$osip){
+function setting(){
 	read -p "输入Zabbix server IP：" serverip
 	#备份配置
 	cp /etc/zabbix/zabbix_agentd.conf /etc/zabbix/zabbix_agentd.conf.bak
 	#设置Server name
-	sed -i "s/Hostname=Zabbix server/Hostname=${hostname}/g" ${zabbix_config}
+	sed -i "s/Hostname=Zabbix server/Hostname=$1/g" ${zabbix_config}
 	#设置连接IP
-	sed -i "s/# SourceIP=/SourceIP=${osip}/g" ${zabbix_config}
+	sed -i "s/# SourceIP=/SourceIP=$2/g" ${zabbix_config}
 	#设置Server IP
-	sed -i "s/ServerActive=127.0.0.1/ServerActive=${serverip}/g" ${zabbix_config}
-	echo "\n"
+	sed -i "s/Server=127.0.0.1/Server=${serverip}/g" ${zabbix_config}
+	
 	echo "#####		设置成功		#####"
 	echo "Server IP:${serverip}"
-	echo "Agent:${osip}:10050"
+	echo "Agent:$2:10050"
 	echo "###############################"
 }
 
@@ -80,14 +80,22 @@ echo "q) 退出"
 echo "----------------------------------"
 read -p ":" num
 case $num in
-	1) 
-		centos7()
-		setting($hostname,$osip)
-		chk_firewall()
+	1)
+		#安装
+		centos7
+		#设置
+		setting $hostname $osip
+		#放行端口
+		chk_firewall
+		#启动服务
 		systemctl start zabbix-agent.service
 	;;
 	2) 
-	echo "CentOS 6"
+		centos6
+		setting $hostname $osip
+		#放行端口
+		chk_firewall
+		service zabbix-agent start
 	;;
 	3) 
 	echo "Debian 8"