From c9bfa40209d23f36a1f633403549ce69a29b7897 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 22 Sep 2022 21:21:55 -0500 Subject: [PATCH 1/3] The rebase dance is BS c9e0af4286e27487e3d1a13e7cb71d908bd35a6e Pushing related work #3353 before other's open PRs #2946 tend to break open PRs when forced to needlessly rebase --- prod.env.j2 => roles/azuracast/templates/prod.env.j2 | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename prod.env.j2 => roles/azuracast/templates/prod.env.j2 (100%) diff --git a/prod.env.j2 b/roles/azuracast/templates/prod.env.j2 similarity index 100% rename from prod.env.j2 rename to roles/azuracast/templates/prod.env.j2 From 8d38ed748f20c53b396cdab949573df7f86fd12c Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 22 Sep 2022 22:07:03 -0500 Subject: [PATCH 2/3] Clean up nginx template - doesn't quite work yet anyway --- roles/azuracast/templates/azuracast-nginx.conf.j2 | 9 --------- 1 file changed, 9 deletions(-) diff --git a/roles/azuracast/templates/azuracast-nginx.conf.j2 b/roles/azuracast/templates/azuracast-nginx.conf.j2 index 985f10602..e79bc4bed 100644 --- a/roles/azuracast/templates/azuracast-nginx.conf.j2 +++ b/roles/azuracast/templates/azuracast-nginx.conf.j2 @@ -13,12 +13,3 @@ location /radio/ { proxy_set_header X-Script-Name /radio; proxy_pass http://127.0.0.1:{{ azuracast_http_port }}; } - -# http://box/livres -location {{ calibreweb_url3 }}/ { - proxy_set_header Host $http_host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Scheme $scheme; - proxy_set_header X-Script-Name {{ calibreweb_url3 }}; - proxy_pass http://127.0.0.1:8083; -} From b4f5e12f19df37ef33cae106f5da86a4725dae70 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 22 Sep 2022 22:11:52 -0500 Subject: [PATCH 3/3] Note --- roles/azuracast/templates/azuracast-nginx.conf.j2 | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/azuracast/templates/azuracast-nginx.conf.j2 b/roles/azuracast/templates/azuracast-nginx.conf.j2 index e79bc4bed..33ae25476 100644 --- a/roles/azuracast/templates/azuracast-nginx.conf.j2 +++ b/roles/azuracast/templates/azuracast-nginx.conf.j2 @@ -1,3 +1,4 @@ +# work in progress might never be ready as the web interface has setting that would need to match location /azuracast/ proxy_set_header Host $http_host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;