summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--roles/pad-proxy/templates/etherpad.nginx.conf3
1 files changed, 3 insertions, 0 deletions
diff --git a/roles/pad-proxy/templates/etherpad.nginx.conf b/roles/pad-proxy/templates/etherpad.nginx.conf
index b657b98..2c285af 100644
--- a/roles/pad-proxy/templates/etherpad.nginx.conf
+++ b/roles/pad-proxy/templates/etherpad.nginx.conf
@@ -24,6 +24,9 @@ server {
proxy_buffering off;
proxy_pass http://etherpad_upstream;
}
+ location /emacsconf/?$ {
+ return 301 /p/{{ emacsconf_year }};
+ }
location /p/ {
rewrite ^/p/(.*) /$1 redirect;
}