From 55724b9eb6bf3f21b1d26a92e3dd00cd4213e809 Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Thu, 11 Aug 2022 15:22:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 zabbix-ansible/hosts                       | 11 ++++++++---
 zabbix-ansible/mariadb/tasks/main.yml      |  2 +-
 zabbix-ansible/roles.yml                   |  2 +-
 zabbix-ansible/zabbix-agentd/vars/main.yml |  2 +-
 zabbix-ansible/zabbix-server/vars/main.yml |  2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/zabbix-ansible/hosts b/zabbix-ansible/hosts
index be191be..035d0f5 100644
--- a/zabbix-ansible/hosts
+++ b/zabbix-ansible/hosts
@@ -1,17 +1,22 @@
 [server]
-192.168.96.144
+192.168.96.234
 
 [database]
-192.168.96.144
+192.168.96.234
 
 [zabbix-server:children]
 server
 database
 
 [zabbix-server:vars]
+dbHost=192.168.96.234
 dbUser=remote
 dbPassword=123456
 dbName=zabbix
 
 [agent]
-192.168.96.144 Hostname=zabbix-agent
+192.168.96.234 Hostname=zabbix-agent 
+192.168.96.235 Hostname=zabbix-agent
+
+[agent:vars]
+serverHost=192.168.96.234
diff --git a/zabbix-ansible/mariadb/tasks/main.yml b/zabbix-ansible/mariadb/tasks/main.yml
index 271f719..bc35d3e 100644
--- a/zabbix-ansible/mariadb/tasks/main.yml
+++ b/zabbix-ansible/mariadb/tasks/main.yml
@@ -15,4 +15,4 @@
   service: name=mariadb state=started
 
 - name: init database
-  shell: mysql -e "create database {{ dbName }} character set utf8 collate utf8_bin; grant all on {{ dbName }}.* to '{{ dbUser }}'@'%' identified by '{{ dbPassword }}';flush privileges;"
+  shell: mysql -e "create database if not exists {{ dbName }} character set utf8 collate utf8_bin; grant all on {{ dbName }}.* to '{{ dbUser }}'@'%' identified by '{{ dbPassword }}';flush privileges;"
diff --git a/zabbix-ansible/roles.yml b/zabbix-ansible/roles.yml
index 6fa62c7..757ef4b 100644
--- a/zabbix-ansible/roles.yml
+++ b/zabbix-ansible/roles.yml
@@ -1,5 +1,5 @@
 ---
-- hosts: server
+- hosts: agent
   remote_user: root
   roles:
   - zabbix-agentd
diff --git a/zabbix-ansible/zabbix-agentd/vars/main.yml b/zabbix-ansible/zabbix-agentd/vars/main.yml
index 8f8abdb..385612a 100644
--- a/zabbix-ansible/zabbix-agentd/vars/main.yml
+++ b/zabbix-ansible/zabbix-agentd/vars/main.yml
@@ -2,6 +2,6 @@
 # vars file for zabbix-agentd
 
 zabbixServerLevel: 5.0
-ServerIP: 192.168.96.144
+ServerIP: "{{ serverHost }}"
 # True 为被动模式，False为主动，主动模式需配置 hosts 文件中的主机名
 mode: True
diff --git a/zabbix-ansible/zabbix-server/vars/main.yml b/zabbix-ansible/zabbix-server/vars/main.yml
index 3c4a77e..9a86505 100644
--- a/zabbix-ansible/zabbix-server/vars/main.yml
+++ b/zabbix-ansible/zabbix-server/vars/main.yml
@@ -1,4 +1,4 @@
 ---
 # vars file for zabbix-server
 zabbixServerLevel: 5.0
-database: 192.168.96.144
+database: "{{ dbHost }}"