Issue 245 - Unify SSL configuration for all servers

modules/discourse/files/site.conf

Index: modules/discourse/files/site.conf
===================================================================
rename from modules/discourse/templates/site.erb
rename to modules/discourse/files/site.conf
--- a/modules/discourse/templates/site.erb
+++ b/modules/discourse/files/site.conf
@@ -1,72 +1,43 @@
-upstream discourse {
-  server localhost:3000;
-}
+gzip on;
+gzip_min_length 1000;
+gzip_types application/json text/css application/x-javascript;
 
-server {
-  server_name <%= @domain %>;
+sendfile on;
+keepalive_timeout 65;
 
-  <% if is_default %>
-    listen 80 default_server;
-    listen [::]:80 default_server;
-  <% else %>
-    listen 80;
-    listen [::]:80;
-  <% end %>
+location /
+{
+  root /opt/discourse/public;
 
-  location / {
-    rewrite (.*) https://$host$1 permanent;
+  location ~ ^/t\/[0-9]+\/[0-9]+\/avatar
+  {
+    expires 1d;
+    add_header Cache-Control public;
+    add_header ETag "";
+  }
+
+  location ~ ^/assets/
+  {
+    expires 1y;
+    add_header Cache-Control public;
+    add_header ETag "";
+    break;
+  }
+
+  # If the file exists as a static file serve it directly without
+  # running all the other rewite tests on it
+  if (-f $request_filename)
+  {
+    break;
+  }
+
+  proxy_set_header X-Real-IP $remote_addr;
+  proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+  proxy_set_header X-Forwarded-Proto $scheme;
+  proxy_set_header Host $http_host;
+  if (!-f $request_filename)
+  {
+    proxy_pass http://discourse;
+    break;
   }
 }
-server {
-  server_name <%= @domain %>;
-
-  <% if is_default %>
-    listen 443 ssl default_server;
-    listen [::]:443 ssl default_server;
-  <% else %>
-    listen 443 ssl;
-    listen [::]:443 ssl;
-  <% end %>
-
-  ssl_certificate sites-available/adblockplus.org_sslcert.pem;
-  ssl_certificate_key sites-available/adblockplus.org_sslcert.key;
-
-  gzip on;
-  gzip_min_length 1000;
-  gzip_types application/json text/css application/x-javascript;
-
-  sendfile on;
-  keepalive_timeout 65;
-
-  location / {
-    root /opt/discourse/public;
-
-    location ~ ^/t\/[0-9]+\/[0-9]+\/avatar {
-      expires 1d;
-      add_header Cache-Control public;
-      add_header ETag "";
-    }
-
-    location ~ ^/assets/ {
-      expires 1y;
-      add_header Cache-Control public;
-      add_header ETag "";
-      break;
-    }
-
-    # If the file exists as a static file serve it directly without
-    # running all the other rewite tests on it
-    if (-f $request_filename) {
-      break;
-    }
-
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header X-Forwarded-Proto $scheme;
-    proxy_set_header Host $http_host;
-    if (!-f $request_filename) {
-      proxy_pass http://discourse;
-      break;
-    }
-  }
-}