From 07d8698dde10d57e58c464f0472b244ec78b8254 Mon Sep 17 00:00:00 2001
From: Sacha Chua <sacha@sachachua.com>
Date: Sat, 26 Nov 2022 18:55:10 -0500
Subject: remove extra /emacsconf/ from mounts
---
roles/pad-proxy/templates/etherpad.nginx.conf | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
(limited to 'roles/pad-proxy')
diff --git a/roles/pad-proxy/templates/etherpad.nginx.conf b/roles/pad-proxy/templates/etherpad.nginx.conf
index 95838be..3131178 100644
--- a/roles/pad-proxy/templates/etherpad.nginx.conf
+++ b/roles/pad-proxy/templates/etherpad.nginx.conf
@@ -11,14 +11,13 @@ server {
include snippets/well-known-acme-challenge.conf;
location / {
return 302 https://$server_name$request_uri;
- }
- }
- server {
- listen 443 ssl http2;
- listen [::]:443 ssl http2;
- server_name {{ etherpad_server_name }};
- include {{ etherpad_tls }};
-
+ }
+}
+server {
+ listen 443 ssl http2;
+ listen [::]:443 ssl http2;
+ server_name {{ etherpad_server_name }};
+ include {{ etherpad_tls }};
{% endif %}
access_log /var/log/nginx/{{ etherpad_server_name }}.access.log;
location ~ ^/(locales/|locales.json|admin/|static/|pluginfw/|javascripts/|socket.io/|ep/|minified/|api/|ro/|error/|jserror/|favicon.ico|robots.txt) {
@@ -45,15 +44,12 @@ server {
rewrite /(.*) https://etherpad.wikimedia.org/p/emacsconf-$1 redirect;
}
{% else %}
- location ~ ^/$ {
- proxy_buffering off;
- proxy_pass http://etherpad_upstream;
- }
location ~ ^/pad-lister($|\/.*) {
proxy_buffering off;
proxy_pass http://etherpad_upstream;
}
location / {
+ rewrite ^/?$ https://pad.emacsconf.org/2022 redirect;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
--
cgit v1.2.3