From 164d717ffe20da850f9118a93ec40e6de82cd34d Mon Sep 17 00:00:00 2001
From: Stefan Haun <tux@netz39.de>
Date: Wed, 9 Dec 2020 19:26:05 +0100
Subject: [PATCH] Move tau-specific phpmyadmin setup to main playbook
---
main.yml | 22 +++++++++++++++++++++-
tasks/phpmyadmin.yml | 23 -----------------------
2 files changed, 21 insertions(+), 24 deletions(-)
delete mode 100644 tasks/phpmyadmin.yml
diff --git a/main.yml b/main.yml
index 90e5093..85b6fad 100644
--- a/main.yml
+++ b/main.yml
@@ -56,4 +56,24 @@
include_tasks: tasks/httpd.yml
- name: Setup phpmyadmin
- include_tasks: tasks/phpmyadmin.yml
+ docker_container:
+ name: phpmyadmin
+ state: started
+ image: phpmyadmin:5.0
+ networks_cli_compatible: true
+ networks:
+ - name: dockernet
+ restart_policy: always
+ env:
+ PMA_HOST: 192.168.0.1
+ MYSQL_ROOT_PASSWORD: "{{ mysql_root_pw }}"
+ PMA_ABSOLUTE_URI: "https://mysql.adm.netz39.de"
+ published_ports:
+ - 9001:80
+
+ - name: Setup proxy site mysql.adm.netz39.de
+ include_role:
+ name: setup-http-site-proxy
+ vars:
+ site_name: mysql.adm.netz39.de
+ proxy_port: 9001
diff --git a/tasks/phpmyadmin.yml b/tasks/phpmyadmin.yml
deleted file mode 100644
index c9e0a09..0000000
--- a/tasks/phpmyadmin.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-- name: Setup phpmyadmin
- docker_container:
- name: phpmyadmin
- state: started
- image: phpmyadmin:5.0
- networks_cli_compatible: true
- networks:
- - name: dockernet
- restart_policy: always
- env:
- PMA_HOST: 192.168.0.1
- MYSQL_ROOT_PASSWORD: "{{ mysql_root_pw }}"
- PMA_ABSOLUTE_URI: "https://mysql.adm.netz39.de"
- published_ports:
- - 9001:80
-
-- name: Setup proxy site mysql.adm.netz39.de
- include_role:
- name: setup-http-site-proxy
- vars:
- site_name: mysql.adm.netz39.de
- proxy_port: 9001