From 27bb55bf22c7b9bf1c71d66a8b836db2e9dcad0c Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Mon, 27 Sep 2021 15:12:20 -0500
Subject: [PATCH] Convert pi-media-1 to ingress role

---
 playbooks/home_media.yml | 64 +++++++++++-----------------------------
 1 file changed, 18 insertions(+), 46 deletions(-)

diff --git a/playbooks/home_media.yml b/playbooks/home_media.yml
index 0e7aa76..6c9f2c5 100755
--- a/playbooks/home_media.yml
+++ b/playbooks/home_media.yml
@@ -30,51 +30,6 @@
     - name: ensure docker network
       docker_network: name=web
       tags: [ docker ]
-    - name: ensure docker nginx config
-      copy:
-        dest: /data/nginx/conf.d/vhosts.conf
-        mode: "0644"
-        content: |
-          server {
-            listen 80 default_server;
-            server_name transmission.local.desu.ltd;
-            location / {
-              proxy_set_header Host $host;
-              proxy_set_header X-Real-IP $remote_addr;
-              proxy_pass http://transmission:9091;
-            }
-          }
-          server {
-            listen 80;
-            server_name jackett.local.desu.ltd;
-            location / {
-              proxy_set_header Host $host;
-              proxy_set_header X-Real-IP $remote_addr;
-              proxy_pass http://jackett:9117;
-            }
-          }
-          server {
-            listen 80;
-            server_name sonarr.local.desu.ltd;
-            location / {
-              proxy_set_header Host $host;
-              proxy_set_header X-Real-IP $remote_addr;
-              proxy_pass http://sonarr:8989;
-            }
-          }
-          server {
-            listen 80;
-            server_name radarr.local.desu.ltd;
-            location / {
-              proxy_http_version 1.1;
-              proxy_set_header Upgrade $http_upgrade;
-              proxy_set_header Connection $http_connection;
-              proxy_set_header Host $host;
-              proxy_set_header X-Real-IP $remote_addr;
-              proxy_pass http://radarr:7878;
-            }
-          }
-      tags: [ docker, ingress ]
     - name: include tasks for apps
       include_tasks: tasks/app/{{ task }}
       with_items:
@@ -89,7 +44,6 @@
         - jackett.yml
         - sonarr.yml
         - radarr.yml
-        - ingress-insecure.yml
       loop_control:
         loop_var: task
       tags: [ always ]
@@ -102,6 +56,24 @@
           - /data/sonarr
         backup_time: "Mon *-*-* 02:00:00"
       tags: [ backup ]
+    - role: ingress
+      vars:
+        ingress_container_image: "nginx:latest"
+        ingress_container_ports:
+          - 80:80
+        ingress_container_persist_dir: /data/nginx
+        ingress_listen_args: 80
+        ingress_listen_tls: no
+        ingress_servers:
+          - name: transmission.local.desu.ltd
+            proxy_pass: http://transmission:9091
+          - name: jackett.local.desu.ltd
+            proxy_pass: http://jackett:9117
+          - name: sonarr.local.desu.ltd
+            proxy_pass: http://sonarr:8989
+          - name: radarr.local.desu.ltd
+            proxy_pass: http://radarr:7878
+      tags: [ ingress ]
     - role: geerlingguy.postgresql
       vars:
         postgresql_global_config_options: