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

Unified Diff: modules/filterserver/templates/easylist-downloads.adblockplus.org.erb

Issue 5302563972841472: Merge filter and notification servers, have both tasks run on the same servers (Closed)
Patch Set: Created Jan. 30, 2014, 11:49 a.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/filterserver/templates/easylist-downloads.adblockplus.org.erb
===================================================================
rename from modules/filterserver/files/easylist-downloads.adblockplus.org
rename to modules/filterserver/templates/easylist-downloads.adblockplus.org.erb
--- a/modules/filterserver/files/easylist-downloads.adblockplus.org
+++ b/modules/filterserver/templates/easylist-downloads.adblockplus.org.erb
@@ -1,13 +1,20 @@
server {
- listen 80 default_server;
- listen [::]:80 default_server;
- listen 443 ssl default_server;
- listen [::]:443 ssl default_server;
+ <% if is_default %>
+ listen 80 default_server;
+ listen [::]:80 default_server;
+ listen 443 ssl default_server;
+ listen [::]:443 ssl default_server;
+ <% else %>
+ listen 80;
Felix Dahlke 2014/01/30 13:51:48 I think it should be fine to always go with this v
Felix Dahlke 2014/01/30 13:58:02 I suppose it does make sense to be able to specify
Wladimir Palant 2014/01/30 14:11:36 No, normally there will be no default server - the
+ listen [::]:80;
+ listen 443 ssl;
+ listen [::]:443 ssl;
+ <% end %>
server_name easylist-downloads.adblockplus.org easylist-msie.adblockplus.org;
access_log /var/log/nginx/access_log_easylist_downloads main;
root /var/www/easylist;
keepalive_timeout 0;
charset utf-8;
gzip_static on;
default_type text/plain;

Powered by Google App Engine
This is Rietveld