From b4e8fc18d7b7c48bff8a4e434a406b6767df7d4e Mon Sep 17 00:00:00 2001
From: Stefan Haun <tux@netz39.de>
Date: Wed, 9 Dec 2020 19:28:56 +0100
Subject: [PATCH] Move tau-specific Apache setup to main playbook
---
main.yml | 14 ++++++++++++++
tasks/httpd.yml | 16 ----------------
2 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/main.yml b/main.yml
index 50ed72e..ce5d2e8 100644
--- a/main.yml
+++ b/main.yml
@@ -61,6 +61,20 @@
- name: Setup httpd
include_tasks: tasks/httpd.yml
+ - name: Setup forward site reservierung.netz39.de
+ include_role:
+ name: setup-http-site-forward
+ vars:
+ site_name: reservierung.netz39.de
+ forward_to: https://codimd.pingtech.de/aYsBj5wSTviFTozd8b0P_Q
+
+ - name: Setup proxy site testredmine.netz39.de
+ include_role:
+ name: setup-http-site-proxy
+ vars:
+ site_name: testredmine.netz39.de
+ proxy_port: 9004
+
- name: Setup phpmyadmin
docker_container:
name: phpmyadmin
diff --git a/tasks/httpd.yml b/tasks/httpd.yml
index 5dc8983..349e53d 100644
--- a/tasks/httpd.yml
+++ b/tasks/httpd.yml
@@ -9,19 +9,3 @@
apache2_module:
name: rewrite
state: present
-
-
-- name: Setup forward site reservierung.netz39.de
- include_role:
- name: setup-http-site-forward
- vars:
- site_name: reservierung.netz39.de
- forward_to: https://codimd.pingtech.de/aYsBj5wSTviFTozd8b0P_Q
-
-
-- name: Setup proxy site testredmine.netz39.de
- include_role:
- name: setup-http-site-proxy
- vars:
- site_name: testredmine.netz39.de
- proxy_port: 9004