Issue 245 - Unify SSL configuration for all servers

modules/trac/files/site.conf

Index: modules/trac/files/site.conf
===================================================================
rename from modules/trac/templates/site.erb
rename to modules/trac/files/site.conf
--- a/modules/trac/templates/site.erb
+++ b/modules/trac/files/site.conf
@@ -1,45 +1,12 @@
-server {
-  server_name <%= @domain %>;
-
-  <% if is_default %>
-    listen 80 default_server;
-    listen [::]:80 default_server;
-  <% else %>
-    listen 80;
-    listen [::]:80;
-  <% end %>
-
-  location / {
-    rewrite (.*) https://$host$1 permanent;
-  }
+location /
+{

[Felix Dahlke, 2014/04/09 18:13:25]

We're not really consistent with opening braces in nginx configuration files,
how about addressing this while we're at it? I'm not sure what we use more
commonly, same line or next line, but it'd be nice if this was consistent.

+  fastcgi_pass unix:/tmp/trac-fastcgi.sock;
+  fastcgi_split_path_info ^()(.*)$;
+  include /etc/nginx/fastcgi_params;
+  fastcgi_param PATH_INFO $fastcgi_path_info;
 }
 
-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 adblockplus.org_sslcert.pem;
-  ssl_certificate_key adblockplus.org_sslcert.key;
-
-  add_header Strict-Transport-Security max-age=31536000;
-
-  location /
-  {
-    fastcgi_pass unix:/tmp/trac-fastcgi.sock;
-    fastcgi_split_path_info ^()(.*)$;
-    include /etc/nginx/fastcgi_params;
-    fastcgi_param PATH_INFO $fastcgi_path_info;
-  }
-
-  location /chrome/
-  {
-    alias /home/trac/htdocs/htdocs/;
-  }
+location /chrome/
+{
+  alias /home/trac/htdocs/htdocs/;
 }