Add Filtermaster

modules/filterserver/manifests/init.pp

 class filterserver {
   class {'nginx':
     worker_processes => 2,
     worker_connections => 4000,
     ssl_session_cache => off,
   }
 
   class {'statsclient':
     log_path => '/var/log/nginx/access_log_easylist_downloads.1.gz',
   }
@@ skipping 66 matching lines @@
     source => 'puppet:///modules/filterserver/logrotate'
   }
 
   file {'/home/rsync/.ssh':
     ensure => directory,
     require => User['rsync'],
     owner => rsync,
     mode => 0600;
   }
 
-  file {'/home/rsync/.ssh/known_hosts':
-    ensure => file,
-    require => [
-                 File['/home/rsync/.ssh'],
-                 User['rsync']
-               ],
+  concat{'/home/rsync/.ssh/known_hosts':

[Felix Dahlke, 2013/11/14 15:07:31]

Space before {, likewise below.

Using a template here would really be easier, but this is fine by me.

[christian, 2013/11/14 15:26:43]

Done.

     owner => rsync,
     mode => 0444,
-    source => 'puppet:///modules/filterserver/known_hosts'
+  }
+
+  concat::fragment{'filtermaster_hostname':
+    target => '/home/rsync/.ssh/known_hosts',
+    content => 'filtermaster.adblockplus.org ',
+    order => 1,
+  }
+
+  concat::fragment{'filtermaster_hostkey':
+    target => '/home/rsync/.ssh/known_hosts',
+    source => 'puppet:///modules/private/filtermaster.adblockplus.org_ssh.pub',
+    order => 2,
   }
 
   file {'/home/rsync/.ssh/id_rsa':
     ensure => file,
     require => [
                  File['/home/rsync/.ssh'],
                  User['rsync']
                ],
     owner => rsync,
     mode => 0400,
@@ skipping 11 matching lines @@
     source => 'puppet:///modules/private/rsync@easylist-downloads.adblockplus.org.pub'
   }
 
   cron {'mirror':
     ensure => present,
     require => [
                  File['/home/rsync/.ssh/known_hosts'],
                  File['/home/rsync/.ssh/id_rsa'],
                  User['rsync']
                ],
-    command => 'rsync -e ssh -ltprz --delete rsync@ssh.adblockplus.org:. /var/www/easylist/',
+    command => 'rsync -e ssh -ltprz --delete rsync@filtermaster1.adblockplus.org:. /var/www/easylist/',
     environment => ['MAILTO=admins@adblockplus.org,root'],
     user => rsync,
     hour => '*',
     minute => '2-52/10'
   }
 }