From 1c0620ac5faba8b0102fcda0d13446d7d48d2941 Mon Sep 17 00:00:00 2001
From: Christian Elberfeld <christian.elberfeld@adesso.de>
Date: Tue, 10 Jul 2018 22:59:25 +0200
Subject: [PATCH] =?UTF-8?q?vorschlag=20f=C3=BCr=20struktur=20mit=20testumg?=
=?UTF-8?q?ebung?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
webserver-test/docker_mail/tasks/main.yml | 2 ++
webserver-test/main.yml | 13 +++++++++++++
webserver/main.yml | 7 +++++--
3 files changed, 20 insertions(+), 2 deletions(-)
create mode 100644 webserver-test/docker_mail/tasks/main.yml
create mode 100644 webserver-test/main.yml
diff --git a/webserver-test/docker_mail/tasks/main.yml b/webserver-test/docker_mail/tasks/main.yml
new file mode 100644
index 00000000..686622e4
--- /dev/null
+++ b/webserver-test/docker_mail/tasks/main.yml
@@ -0,0 +1,2 @@
+
+# development Mailserver rolle
\ No newline at end of file
diff --git a/webserver-test/main.yml b/webserver-test/main.yml
new file mode 100644
index 00000000..4d4bd64d
--- /dev/null
+++ b/webserver-test/main.yml
@@ -0,0 +1,13 @@
+---
+
+- hosts: webserver
+ remote_user: root
+ roles:
+ - { role: ../common/docker, tags: docker }
+ - { role: ../webserver/nginx, tags: nginx }
+ - { role: ../webserver/docker_jabber, tags: jabber }
+ - { role: ../webserver/docker_ldap, tags: ldap }
+ - { role: ../webserver/docker_warpinfra, tags: warpinfra }
+ - { role: ../webserver/docker_wordpress, tags: wordpress }
+ - { role: docker_mail, tags: mail }
+
diff --git a/webserver/main.yml b/webserver/main.yml
index e13d1638..7e5861b5 100644
--- a/webserver/main.yml
+++ b/webserver/main.yml
@@ -14,10 +14,13 @@
- { role: docker_gitlab, tags: gitlab }
- { role: docker_hackmd, tags: hackmd }
- { role: docker_jabber, tags: jabber }
- - { role: docker_jabber_test, tags: jabber_test }
- { role: docker_ldap, tags: ldap }
- { role: docker_keycloak, tags: keycloak }
- { role: docker_matterbridge, tags: matterbridge }
- { role: docker_warpinfra, tags: warpinfra }
- - { role: docker_warpinfratest, tags: warpinfratest }
- { role: docker_wordpress, tags: wordpress }
+
+
+# Entfällt durch testserver
+# - { role: docker_jabber_test, tags: jabber_test }
+# - { role: docker_warpinfratest, tags: warpinfratest }
--
GitLab