From f0491031571cc3afb4daa28ac8c83d394e7df9fb Mon Sep 17 00:00:00 2001
From: Lars Beckers <lars.beckers@rwth-aachen.de>
Date: Sun, 21 Oct 2018 02:56:20 +0200
Subject: [PATCH] relative imports: move zabbix-repo, remove all others
---
zabbix-agent/meta/main.yml | 2 +-
zabbix-frontend/meta/main.yml | 5 +----
zabbix-proxy/meta/main.yml | 2 +-
zabbix-server/meta/main.yml | 2 +-
4 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/zabbix-agent/meta/main.yml b/zabbix-agent/meta/main.yml
index 4e29b84..d373190 100644
--- a/zabbix-agent/meta/main.yml
+++ b/zabbix-agent/meta/main.yml
@@ -1,3 +1,3 @@
---
dependencies:
- - role: zabbix-repo
+ - role: zabbix/zabbix-repo
diff --git a/zabbix-frontend/meta/main.yml b/zabbix-frontend/meta/main.yml
index 76d5cae..d373190 100644
--- a/zabbix-frontend/meta/main.yml
+++ b/zabbix-frontend/meta/main.yml
@@ -1,6 +1,3 @@
---
dependencies:
- - role: zabbix-repo
- - role: webserver
- - { role: php-fpm, fpm_pool: zabbix, fpm_user: zabbix, fpm_group: zabbix, fpm_socket_user: zabbix, fpm_socket_group: www-data, fpm_params: { date.timezone: "Europe/Berlin", post_max_size: "16M", max_execution_time: 300, max_input_time: 300, always_populate_raw_post_data: -1 } }
-# TODO webserver fails ansible on initial deployment currently by purpose
+ - role: zabbix/zabbix-repo
diff --git a/zabbix-proxy/meta/main.yml b/zabbix-proxy/meta/main.yml
index 4e29b84..d373190 100644
--- a/zabbix-proxy/meta/main.yml
+++ b/zabbix-proxy/meta/main.yml
@@ -1,3 +1,3 @@
---
dependencies:
- - role: zabbix-repo
+ - role: zabbix/zabbix-repo
diff --git a/zabbix-server/meta/main.yml b/zabbix-server/meta/main.yml
index 4e29b84..d373190 100644
--- a/zabbix-server/meta/main.yml
+++ b/zabbix-server/meta/main.yml
@@ -1,3 +1,3 @@
---
dependencies:
- - role: zabbix-repo
+ - role: zabbix/zabbix-repo
--
GitLab