From fd4668297628c30ae97f52e7772f58f5026577f0 Mon Sep 17 00:00:00 2001
From: Sacha Chua <sacha@sachachua.com>
Date: Sat, 19 Nov 2022 10:59:13 -0500
Subject: fix emacsconf on live0

---
 roles/stream/tasks/main.yml                 |  9 +++++++++
 roles/stream/templates/emacsconf.nginx.conf | 29 +++++++++++++----------------
 2 files changed, 22 insertions(+), 16 deletions(-)

(limited to 'roles/stream')

diff --git a/roles/stream/tasks/main.yml b/roles/stream/tasks/main.yml
index 76febe0..d741c72 100644
--- a/roles/stream/tasks/main.yml
+++ b/roles/stream/tasks/main.yml
@@ -47,6 +47,15 @@
     src: emacsconf.nginx.conf
     dest: /etc/nginx/emacsconf.nginx.conf
     mode: 0644
+- name: Include emacsconf in nginx config
+  tags: wip
+  become: true
+  lineinfile:
+    line: include /etc/nginx/emacsconf.nginx.conf;
+    regexp: '^\s*include /etc/nginx/emacsconf.nginx.conf;'
+    insertafter: '.*tls/live0.conf.*'
+    backup: yes
+    path: /etc/nginx/sites-available/live0.emacsconf.org
 - name: Enable icecast
   become: true
   service:
diff --git a/roles/stream/templates/emacsconf.nginx.conf b/roles/stream/templates/emacsconf.nginx.conf
index 57570e9..f814f31 100644
--- a/roles/stream/templates/emacsconf.nginx.conf
+++ b/roles/stream/templates/emacsconf.nginx.conf
@@ -1,18 +1,15 @@
 location /emacsconf/ {
-  try_files $uri $uri/ @emacsconf_upstream;
-  }
-  location @emacsconf_upstream {
-   proxy_pass http://localhost:{{ icecast_port }}/emacsconf/;
-   proxy_http_version 1.1;
-   proxy_buffering off;
-    proxy_request_buffering off;      
-    proxy_set_header Host $http_host;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header X-Forwarded-Proto $scheme;
-    proxy_set_header X-Forwarded-Host $host;
-    proxy_set_header X-Forwarded-Server $host;
-    proxy_set_header X-Real-IP $remote_addr;
-    }
+  proxy_pass http://localhost:{{ icecast_port }};
+  proxy_http_version 1.1;
+  proxy_buffering off;
+  proxy_request_buffering off;      
+  proxy_set_header Host $http_host;
+  proxy_set_header Upgrade $http_upgrade;
+  proxy_set_header Connection "upgrade";
+  proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+  proxy_set_header X-Forwarded-Proto $scheme;
+  proxy_set_header X-Forwarded-Host $host;
+  proxy_set_header X-Forwarded-Server $host;
+  proxy_set_header X-Real-IP $remote_addr;
+}
     
\ No newline at end of file
-- 
cgit v1.2.3