modules/filterserver/templates/easylist-downloads.adblockplus.org.erb - Issue 5302563972841472: Merge filter and notification servers, have both tasks run on the same servers

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

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: Stopped misusing is_default parameter Created Jan. 30, 2014, 2:10 p.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

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;

+ 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;