Issue 245 - Unify SSL configuration for all servers

modules/notificationserver/files/site.conf

Index: modules/notificationserver/files/site.conf
===================================================================
rename from modules/notificationserver/templates/notification.adblockplus.org.erb
rename to modules/notificationserver/files/site.conf
--- a/modules/notificationserver/templates/notification.adblockplus.org.erb
+++ b/modules/notificationserver/files/site.conf
@@ -1,43 +1,13 @@
-# notification.adblockplus.org
-server {
-  <% if is_default %>
-    listen 80 default_server;
-    listen [::]:80 default_server;
-  <% else %>
-    listen 80;
-    listen [::]:80;
-  <% end %>
+# redirect server error pages to the static page /50x.html
+#
+error_page   500 502 503 504  /50x.html;

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

While we're at it, can we normalise white space here? Just one space after
"error_page" and "504", or not? Also below (after "root") and in other nginx
files.

+location = /50x.html {
+  root   html;
+}
 
-  server_name  notification.adblockplus.org;
-  location / {
-    rewrite (.*) https://notification.adblockplus.org$1 permanent;
-  }
+location /.hg {
+  internal;
 }
-server {
-  <% if is_default %>
-    listen 443 ssl default_server;
-    listen [::]:443 ssl default_server;
-  <% else %>
-    listen 443 ssl;
-    listen [::]:443 ssl;
-  <% end %>
 
-  server_name  notification.adblockplus.org;
-  ssl_certificate sites-available/adblockplus.org_sslcert.pem;
-  ssl_certificate_key sites-available/adblockplus.org_sslcert.key;
-
-  # redirect server error pages to the static page /50x.html
-  #
-  error_page   500 502 503 504  /50x.html;
-  location = /50x.html {
-    root   html;
-  }
-
-  location /.hg {
-    internal;
-  }
-
-  access_log  /var/log/nginx/access_log_notification  main;
-  keepalive_timeout 0;
-  root   /var/www/notification;
-}
+keepalive_timeout 0;
+root   /var/www/notification;