Issue 245 - Unify SSL configuration for all servers

modules/downloadserver/files/site.conf

Index: modules/downloadserver/files/site.conf
===================================================================
rename from modules/downloadserver/files/downloads.adblockplus.org
rename to modules/downloadserver/files/site.conf
--- a/modules/downloadserver/files/downloads.adblockplus.org
+++ b/modules/downloadserver/files/site.conf
@@ -1,46 +1,24 @@
-# downloads.adblockplus.org
-server {
-  listen       80 default_server;
-  listen       [::]:80 default_server;
-  server_name  downloads.adblockplus.org;
-  location / {
-    rewrite (.*) https://downloads.adblockplus.org$1 permanent;
-  }
+keepalive_timeout 0;
+root /var/www/downloads;
+
+location /.hg
+{
+  internal;
 }
-server {
-  listen       443 ssl default_server;
-  listen       [::]:443 ssl default_server;
-  server_name  downloads.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;
-  }
+# This redirect is necessary since we accidentally set the wrong
+# update URL in ABP for Android 1.2. It can be removed once we're
+# not seeing anyone requesting this file anymore.
+# Note that this intentionally promotes devbuilds to release builds.
+# Since newer versions should use the new devbuild and release
+# build update URLs requested by libadblockplus, leaving this
+# redirect around won't really hurt.
+location /devbuilds/adblockplusandroid/updates.xml
+{
+  rewrite ^ https://adblockplus.org/androidupdates.xml?$query_string redirect;
+}
 
-  location /.hg {
-    internal;
-  }
-
-  # This redirect is necessary since we accidentally set the wrong
-  # update URL in ABP for Android 1.2. It can be removed once we're
-  # not seeing anyone requesting this file anymore.
-  # Note that this intentionally promotes devbuilds to release builds.
-  # Since newer versions should use the new devbuild and release
-  # build update URLs requested by libadblockplus, leaving this
-  # redirect around won't really hurt.
-  location /devbuilds/adblockplusandroid/updates.xml {
-    rewrite ^ https://adblockplus.org/androidupdates.xml?$query_string redirect;
-  }
-
-  access_log  /var/log/nginx/access_log_downloads  main;
-  keepalive_timeout 0;
-  root   /var/www/downloads;
-
-  location /devbuilds {
-    alias /var/www/devbuilds;
-  }
+location /devbuilds
+{
+  alias /var/www/devbuilds;
 }