Merge filter and notification servers, have both tasks run on the same servers

modules/filterserver/templates/easylist-downloads.adblockplus.org.erb

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 version, wouldn't it? The first
server that's getting defined would be the default server AFAIK.

[Felix Dahlke, 2014/01/30 13:58:02]

I suppose it does make sense to be able to specify the default server. So I'm
fine with keeping this. However, I'd prefer the |if !defined()| version for
making sure nginx and /var/www aren't defined twice. I'd also prefer to not
explicitly set is_default to false for notificationserver in the node manifest.

[Wladimir Palant, 2014/01/30 14:11:36]

No, normally there will be no default server - the requests will fall back to
nginx' default www directory. So I'd rather keep the is_default parameter, same
as in the web module.

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