From 0781b4c175b3b5fbcf49c51159e8c14bf8c192f5 Mon Sep 17 00:00:00 2001
From: Felix Stupp <felix.stupp@outlook.com>
Date: Mon, 24 May 2021 15:26:17 +0200
Subject: [PATCH] nginx/forward: Redeveloped using nginx/server template

---
 roles/nginx/forward/meta/main.yml          |  6 ++++--
 roles/nginx/forward/tasks/main.yml         | 12 ------------
 roles/nginx/forward/templates/forward.conf | 14 --------------
 3 files changed, 4 insertions(+), 28 deletions(-)
 delete mode 100644 roles/nginx/forward/tasks/main.yml
 delete mode 100644 roles/nginx/forward/templates/forward.conf

diff --git a/roles/nginx/forward/meta/main.yml b/roles/nginx/forward/meta/main.yml
index 4e8a0c7..0d3f91e 100644
--- a/roles/nginx/forward/meta/main.yml
+++ b/roles/nginx/forward/meta/main.yml
@@ -3,5 +3,7 @@
 allow_duplicates: yes
 
 dependencies:
-  - role: acme/certificate
-  - role: nginx/application
+  - role: nginx/server
+    # domain
+    directives: |
+      return 301 https://{{ dest }}$request_uri;
diff --git a/roles/nginx/forward/tasks/main.yml b/roles/nginx/forward/tasks/main.yml
deleted file mode 100644
index 471a863..0000000
--- a/roles/nginx/forward/tasks/main.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-
-- name: Enable forwarding {{ domain }} to {{ dest }}
-  template:
-    src: forward.conf
-    dest: "{{ nginx_sites_directory }}/{{ domain }}"
-    owner: root
-    group: root
-    mode: "u=rw,g=r,o=r"
-  notify: reload nginx
-  tags:
-    - certificate
diff --git a/roles/nginx/forward/templates/forward.conf b/roles/nginx/forward/templates/forward.conf
deleted file mode 100644
index 5bc928b..0000000
--- a/roles/nginx/forward/templates/forward.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-server {
-  listen 443 ssl http2;
-  listen [::]:443 ssl http2;
-  server_name {{ effective_domain }};
-
-  ssl on;
-  ssl_certificate {{ acme_fullchain_location }};
-  ssl_certificate_key {{ acme_key_location }};
-
-  include {{ nginx_snippets_directory }}/https;
-  include {{ nginx_snippets_directory }}/global;
-
-  return 301 https://{{ dest }}$request_uri;
-}