etherpad-lite: move to generic nginx-vhost template

1 files changed, 32 insertions, 56 deletions

diff --git a/roles/apps/etherpad-lite/templates/nginx-vhost.conf.j2 b/roles/apps/etherpad-lite/templates/nginx-vhost.conf.j2
index c572a7eb..209a81c0 100644
--- a/roles/apps/etherpad-lite/templates/nginx-vhost.conf.j2
+++ b/roles/apps/etherpad-lite/templates/nginx-vhost.conf.j2
@@ -1,57 +1,33 @@
-server {
-    listen 80;
-    listen [::]:80;
-    server_name {{ item.value.hostnames | join(' ') }};
-
-    include snippets/{{ acme_client }}.conf;
-
-    location / {
-        return 301 https://$host$request_uri;
-    }
-}
-
-server {
-    listen 443 ssl http2;
-    listen [::]:443 ssl http2;
-    server_name {{ item.value.hostnames | join(' ') }};
-
-    include snippets/{{ acme_client }}.conf;
-    include snippets/tls.conf;
-    ssl_certificate     {{ x509_certificate_path_fullchain }};
-    ssl_certificate_key {{ x509_certificate_path_key }};
-    include snippets/hsts.conf;
-
-    location / {
-        rewrite ^/$ / break;
-        rewrite ^/locales/(.*) /locales/$1 break;
-        rewrite ^/locales.json /locales.json break;
-        rewrite ^/admin(.*) /admin$1 break;
-        rewrite ^/p/(.*) /p/$1 break;
-        rewrite ^/static/(.*) /static/$1 break;
-        rewrite ^/pluginfw/(.*) /pluginfw/$1 break;
-        rewrite ^/javascripts/(.*) /javascripts/$1 break;
-        rewrite ^/socket.io/(.*) /socket.io/$1 break;
-        rewrite ^/ep/(.*) /ep/$1 break;
-        rewrite ^/minified/(.*) /minified/$1 break;
-        rewrite ^/api/(.*) /api/$1 break;
-        rewrite ^/ro/(.*) /ro/$1 break;
-        rewrite ^/error/(.*) /error/$1 break;
-        rewrite ^/jserror(.*) /jserror$1 break;
-        rewrite ^/redirect(.*) /redirect$1 break;
-        rewrite /favicon.ico /favicon.ico break;
-        rewrite /robots.txt /robots.txt break;
-        rewrite /(.*) /p/$1;
-
-        include snippets/proxy-nobuff.conf;
-
-        proxy_set_header Host $host;
-        include snippets/proxy-forward-headers.conf;
-        proxy_pass_header Server;
-
-        # for websockets
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection $connection_upgrade;
-
-        proxy_pass http://127.0.0.1:{{ item.value.port }};
-    }
+location / {
+    rewrite ^/$ / break;
+    rewrite ^/locales/(.*) /locales/$1 break;
+    rewrite ^/locales.json /locales.json break;
+    rewrite ^/admin(.*) /admin$1 break;
+    rewrite ^/p/(.*) /p/$1 break;
+    rewrite ^/static/(.*) /static/$1 break;
+    rewrite ^/pluginfw/(.*) /pluginfw/$1 break;
+    rewrite ^/javascripts/(.*) /javascripts/$1 break;
+    rewrite ^/socket.io/(.*) /socket.io/$1 break;
+    rewrite ^/ep/(.*) /ep/$1 break;
+    rewrite ^/minified/(.*) /minified/$1 break;
+    rewrite ^/api/(.*) /api/$1 break;
+    rewrite ^/ro/(.*) /ro/$1 break;
+    rewrite ^/error/(.*) /error/$1 break;
+    rewrite ^/jserror(.*) /jserror$1 break;
+    rewrite ^/redirect(.*) /redirect$1 break;
+    rewrite /favicon.ico /favicon.ico break;
+    rewrite /robots.txt /robots.txt break;
+    rewrite /(.*) /p/$1;
+
+    include snippets/proxy-nobuff.conf;
+
+    proxy_set_header Host $host;
+    include snippets/proxy-forward-headers.conf;
+    proxy_pass_header Server;
+
+    # for websockets
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection $connection_upgrade;
+
+    proxy_pass http://127.0.0.1:{{ item.value.port }};
 }