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

modules/filterserver/manifests/init.pp

 class filterserver($is_default = false) {
-  if $is_default {
+  if !defined(Class['nginx']) {
     class {'nginx':

[Felix Dahlke, 2014/01/30 13:51:48]

Based on the Puppet documentation, I think this should work:

if !defined(Class['nginx']) {
  class {'nginx':
  …
}

Likewise for /var/www below. I'd prefer that to $is_default if it works.

       worker_processes => 2,
       worker_connections => 4000,
       ssl_session_cache => off,
     }
+  }
 
+  if !defined(File['/var/www']) {
     file {'/var/www':
       ensure => directory,
       owner => nginx,
       mode => 0755,
       require => Package['nginx']
     }
   }
 
   user {'subscriptionstat':
     ensure => absent,
@@ skipping 108 matching lines @@
                  File['/home/rsync/.ssh/id_rsa'],
                  User['rsync']
                ],
     command => 'rsync -e "ssh -o CheckHostIP=no" -ltprz --delete rsync@filtermaster.adblockplus.org:. /var/www/easylist/',
     environment => ['MAILTO=admins@adblockplus.org,root'],
     user => rsync,
     hour => '*',
     minute => '2-52/10'
   }
 }