From df8a265b56766fd392f5ff61b12d13249c9d9188 Mon Sep 17 00:00:00 2001
From: Lars Beckers <lars.beckers@rwth-aachen.de>
Date: Mon, 24 Feb 2020 17:55:17 +0100
Subject: [PATCH] update server deployment to buster
---
zabbix-frontend/handlers/main.yml | 2 +-
zabbix-frontend/tasks/main.yml | 8 ++---
zabbix-repo/tasks/main.yml | 59 ++++++++++++++++---------------
zabbix-server/tasks/main.yml | 4 +--
4 files changed, 37 insertions(+), 36 deletions(-)
diff --git a/zabbix-frontend/handlers/main.yml b/zabbix-frontend/handlers/main.yml
index 0967765..dbc3416 100644
--- a/zabbix-frontend/handlers/main.yml
+++ b/zabbix-frontend/handlers/main.yml
@@ -1,7 +1,7 @@
---
- name: restart zabbix frontend
- systemd: name=php7.0-fpm.service state=restarted
+ systemd: name=php-fpm@zabbix.service state=restarted
- name: create tmpfiles
command: systemd-tmpfiles --create
diff --git a/zabbix-frontend/tasks/main.yml b/zabbix-frontend/tasks/main.yml
index f20fbf1..87e4209 100644
--- a/zabbix-frontend/tasks/main.yml
+++ b/zabbix-frontend/tasks/main.yml
@@ -9,9 +9,9 @@
tags:
- zabbix
-- name: ensure php5-pgsql is available
+- name: ensure php-pgsql is available
apt:
- name: php5-pgsql
+ name: php-pgsql
state: present
notify:
- restart zabbix frontend
@@ -34,7 +34,7 @@
- name: ensure the database server listens on the external interface
replace:
- dest: /etc/postgresql/9.6/main/postgresql.conf
+ dest: /etc/postgresql/11/main/postgresql.conf
regexp: "#listen_addresses = 'localhost'"
replace: "listen_addresses = '*'"
notify:
@@ -46,7 +46,7 @@
- name: ensure the database server allows connections from the server
lineinfile:
- dest: /etc/postgresql/9.6/main/pg_hba.conf
+ dest: /etc/postgresql/11/main/pg_hba.conf
# yamllint disable-line rule:line-length
insertafter: "host all all 127.0.0.1/32 md5"
# yamllint disable-line rule:line-length
diff --git a/zabbix-repo/tasks/main.yml b/zabbix-repo/tasks/main.yml
index b7d9ef8..13b24f6 100644
--- a/zabbix-repo/tasks/main.yml
+++ b/zabbix-repo/tasks/main.yml
@@ -13,7 +13,7 @@
- repos
- zabbix
-- name: ensure apt doest not know about old zabbix repos
+- name: ensure apt does not know about old zabbix repos
apt_repository:
repo: "{{ item }}"
state: absent
@@ -68,33 +68,34 @@
- zabbix
- chr
-- name: query installed packages
- # yamllint disable-line rule:empty-values
- package_facts:
- register: installed_packages
- tags:
- - repos
- - zabbix
-
-- name: check for new packages
- block:
- - name: upload the version check script
- copy:
- src: check-update.py
- dest: "/usr/local/sbin/check-update.py"
- owner: root
- group: root
- mode: '0755'
- - name: ensure the version check script is executed regularly
- template:
- src: crontab.j2
- dest: /etc/cron.d/check-zabbix-version
- owner: root
- group: root
- mode: '0644'
- when: '"zabbix-server-pgsql" in installed_packages.ansible_facts.packages'
- tags:
- - repos
- - zabbix
+# packages facts are somewhat broken, but we're using debian's repos anyway now
+# - name: query installed packages
+# # yamllint disable-line rule:empty-values
+# package_facts:
+# register: installed_packages
+# tags:
+# - repos
+# - zabbix
+#
+# - name: check for new packages
+# block:
+# - name: upload the version check script
+# copy:
+# src: check-update.py
+# dest: "/usr/local/sbin/check-update.py"
+# owner: root
+# group: root
+# mode: '0755'
+# - name: ensure the version check script is executed regularly
+# template:
+# src: crontab.j2
+# dest: /etc/cron.d/check-zabbix-version
+# owner: root
+# group: root
+# mode: '0644'
+# when: '"zabbix-server-pgsql" in installed_packages.ansible_facts.packages'
+# tags:
+# - repos
+# - zabbix
- meta: flush_handlers
diff --git a/zabbix-server/tasks/main.yml b/zabbix-server/tasks/main.yml
index c7a6384..8ea1be6 100644
--- a/zabbix-server/tasks/main.yml
+++ b/zabbix-server/tasks/main.yml
@@ -99,7 +99,7 @@
- name: ensure the database server listens on the external interface
replace:
- dest: /etc/postgresql/9.6/main/postgresql.conf
+ dest: /etc/postgresql/11/main/postgresql.conf
regexp: "#listen_addresses = 'localhost'"
replace: "listen_addresses = '*'"
notify:
@@ -111,7 +111,7 @@
- name: ensure the database server allows connections from the server
lineinfile:
- dest: /etc/postgresql/9.6/main/pg_hba.conf
+ dest: /etc/postgresql/11/main/pg_hba.conf
# yamllint disable-line rule:line-length
insertafter: "host all all 127.0.0.1/32 md5"
# yamllint disable-line rule:line-length
--
GitLab