From e27c8e8cf3be68d3c4089c662217c973f7aedf1e Mon Sep 17 00:00:00 2001
From: uumas <gitcommit@uumas.fi>
Date: Fri, 18 Nov 2022 05:38:40 +0200
Subject: [PATCH] Deprecate reverse_proxy role as all functionality is
 available in vhost

---
 roles/reverse_proxy/README.md         |  2 +-
 roles/reverse_proxy/defaults/main.yml |  5 -----
 roles/reverse_proxy/meta/main.yml     |  3 ---
 roles/reverse_proxy/tasks/caddy.yml   | 20 --------------------
 roles/reverse_proxy/tasks/main.yml    | 13 ++++++++++---
 roles/reverse_proxy/vars/main.yml     |  5 +++++
 6 files changed, 16 insertions(+), 32 deletions(-)
 delete mode 100644 roles/reverse_proxy/defaults/main.yml
 delete mode 100644 roles/reverse_proxy/tasks/caddy.yml
 create mode 100644 roles/reverse_proxy/vars/main.yml

diff --git a/roles/reverse_proxy/README.md b/roles/reverse_proxy/README.md
index 446858b..69d9f45 100644
--- a/roles/reverse_proxy/README.md
+++ b/roles/reverse_proxy/README.md
@@ -1 +1 @@
-Sets up a reverse proxy defined by the `reverse_proxy_type` variable
+Deprecated
diff --git a/roles/reverse_proxy/defaults/main.yml b/roles/reverse_proxy/defaults/main.yml
deleted file mode 100644
index 03cf213..0000000
--- a/roles/reverse_proxy/defaults/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-reverse_proxy_type: caddy
-proxy_target_protocol: http
-proxy_target_host: localhost
diff --git a/roles/reverse_proxy/meta/main.yml b/roles/reverse_proxy/meta/main.yml
index 4dbdb8b..cd21505 100644
--- a/roles/reverse_proxy/meta/main.yml
+++ b/roles/reverse_proxy/meta/main.yml
@@ -1,5 +1,2 @@
 ---
 
-dependencies:
-  - role: caddy
-    when: reverse_proxy_type == 'caddy'
diff --git a/roles/reverse_proxy/tasks/caddy.yml b/roles/reverse_proxy/tasks/caddy.yml
deleted file mode 100644
index 9b6df71..0000000
--- a/roles/reverse_proxy/tasks/caddy.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-
-- name: Add caddy reverse proxy config
-  blockinfile:
-    path: /etc/caddy/Caddyfile
-    marker: "# {mark} ANSIBLE MANAGED BLOCK {{ vhost_id }}"
-    block: |
-      {{ vhost_domains | join(' ') }} {
-        reverse_proxy {{ proxy_target_protocol }}://{{ proxy_target_host }}:{{ proxy_target_port }} {
-        {% if proxy_target_protocol == 'https' and proxy_target_host == 'localhost' %}
-          transport http {
-            tls_insecure_skip_verify
-          }
-        {% endif %}
-        }
-      }
-    validate: 'caddy validate --config %s --adapter caddyfile'
-    backup: true
-  notify: reload caddy
-
diff --git a/roles/reverse_proxy/tasks/main.yml b/roles/reverse_proxy/tasks/main.yml
index 8450d45..be25b6f 100644
--- a/roles/reverse_proxy/tasks/main.yml
+++ b/roles/reverse_proxy/tasks/main.yml
@@ -1,5 +1,9 @@
 ---
 
+- name: Deprecation warning
+  debug:
+    msg: "uumas.general.reverse_proxy is deprecated. You should switch to uumas.general.vhost with vhost_type: reverse_proxy"
+
 - block:
   - name: Split legacy proxy_target to protocol, host and port
     set_fact:
@@ -17,6 +21,9 @@
 
   when: proxy_target is defined and proxy_target_port is not defined
 
-- name: Setup {{ vhost_id }} reverse proxy
-  include_tasks: "{{ reverse_proxy_type }}.yml"
-  when: reverse_proxy_type != 'none'
+- name: configure vhost for reverse proxy
+  include_role: 
+    name: vhost
+  vars:
+    vhost_type: reverse_proxy
+
diff --git a/roles/reverse_proxy/vars/main.yml b/roles/reverse_proxy/vars/main.yml
new file mode 100644
index 0000000..3b43055
--- /dev/null
+++ b/roles/reverse_proxy/vars/main.yml
@@ -0,0 +1,5 @@
+---
+
+reverse_proxy_type: caddy
+web_server: "{{ reverse_proxy_type }}"
+