Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: modules/updateserver/files/site.conf

Issue 5734493784637440: Issue 245 - Unify SSL configuration for all servers (Closed)
Patch Set: Created April 2, 2014, 2:05 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: modules/updateserver/files/site.conf
===================================================================
rename from modules/updateserver/files/update.adblockplus.org
rename to modules/updateserver/files/site.conf
--- a/modules/updateserver/files/update.adblockplus.org
+++ b/modules/updateserver/files/site.conf
@@ -1,25 +1,7 @@
-server {
- listen 80 default_server;
- listen [::]:80 default_server;
- server_name update.adblockplus.org;
- location / {
- rewrite (.*) https://update.adblockplus.org$1 permanent;
- }
+error_page 500 502 503 504 /50x.html;
+location = /50x.html {
+ root html;
}
-server {
- listen 443 ssl default_server;
- listen [::]:443 ssl default_server;
- server_name update.adblockplus.org;
- ssl_certificate sites-available/adblockplus.org_sslcert.pem;
- ssl_certificate_key sites-available/adblockplus.org_sslcert.key;
-
- error_page 500 502 503 504 /50x.html;
- location = /50x.html {
- root html;
- }
-
- access_log /var/log/nginx/access_log_update main;
- keepalive_timeout 0;
- root /var/www/update;
-}
+keepalive_timeout 0;
+root /var/www/update;

Powered by Google App Engine
This is Rietveld