Add Filtermaster

modules/filtermaster/manifests/init.pp

 class filtermaster {
   Cron {
-    #TODO: Change The MAILTO to the correct paramater befor commiting
-    environment => ['MAILTO=ROOT', 'PYTHONPATH=/opt/sitescripts'],
+   #TODO change email
+    environment => ['MAILTO=root', 'PYTHONPATH=/opt/sitescripts'],
   }
-        
+  
   class {'ssh':
     custom_configuration => 'Match User rsync
     AllowTcpForwarding no
     X11Forwarding no
     AllowAgentForwarding no
     GatewayPorts no
-    ForceCommand rsync --server --sender -vltprz --delete-excluded . /home/rsync/subscription/files/subscriptions/data'

[Wladimir Palant, 2013/11/12 13:04:03]

I think the slash at the end of the path isn't optional here.

+    ForceCommand rsync --server --sender -vltprz --delete-excluded . /home/rsync/generated/data/'
   }
   
   user {'rsync':
     ensure => present,
     comment => 'Filter list mirror user',
     home => '/home/rsync',
     managehome => true
   }
 
   file {'/home/rsync/update_repos.sh':
     ensure => file,
-    require => User['rsync'],
     owner => rsync,
     mode => 0700,
     source => 'puppet:///modules/filtermaster/update_repos.sh'
   }
-         
+   
+  file {'/home/rsync/subscription':
+    ensure => directory,
+    owner => rsync
+  }
+
+  file {'/home/rsync/generated':
+    ensure => directory,
+    owner => rsync
+  }
+   
   file {'/home/rsync/.ssh':
     ensure => directory,
-    require => User['rsync'],
     owner => rsync,
     mode => 0600
   }
-  
-  file {'/home/rsync/subscription':
-    ensure => directory,
-    require => User['rsync'],
-    owner => rsync
+
+  file {'/home/rsync/.ssh/authorized_keys':
+    ensure => file,
+    owner => rsync,
+    mode => 0600,
+    source => 'puppet:///modules/private/rsync@easylist-downloads.adblockplus.org.pub'
   }
 
-  file {'/home/rsync/subscription/files':
-    ensure => directory,
-    require => [
-    File['/home/rsync/subscription'],
-    User['rsync']
-    ],
-    owner => rsync
+  file {'/etc/ssh/ssh_host_rsa_key':
+    require => Package['openssh-server'],
+    notify => Service['ssh'],
+    ensure => file,
+    owner => root,
+    group => root,
+    source => 'puppet:///modules/private/filtermaster.adblockplus.org_ssh.key'
   }
 
-  file {'/home/rsync/subscription/files/subscriptions':
-    ensure => directory,
-    require => [
-    File['/home/rsync/subscription/files'],
-    User['rsync']
-    ],
-    owner => rsync
-  }
-         
-  file {'/home/rsync/.ssh/authorized_keys':
+  file {'/etc/ssh/ssh_host_rsa_key.pub':
+    require => Package['openssh-server'],
+    notify => Service['ssh'],
     ensure => file,
-    require => [
-    File['/home/rsync/.ssh'],
-    User['rsync']
-    ],
-    owner => rsync,
-    mode => 0600,
-    source => 'puppet:///modules/filtermaster/authorized_keys'
+    owner => root,
+    group => root,
+    source => 'puppet:///modules/private/filtermaster.adblockplus.org_ssh.pub'
   }
 
   package {['p7zip-full']:}
 
-  define repo_download( ) { 
-    exec { "fetch_${title}":
-      command =>  "hg clone https://hg.adblockplus.org/${title} /home/rsync/subscription/${title}",
+  define repo_download() { 
+    exec {"fetch_${title}":
+      command => "hg clone https://hg.adblockplus.org/${title} /home/rsync/subscription/${title}",
       path => ["/usr/bin/", "/bin/"],
       require => Package['mercurial'],
       user => rsync,
       timeout => 0,
       onlyif => "test ! -d /home/rsync/subscription/${title}"
     }
   }
  
   repo_download {['easylist',
-                  'easylistgermany',
-                  'easylistitaly',
-                  'easylistcombinations',
-                  'malwaredomains',
-                  'ruadlist',
-                  'listefr',
-                  'exceptionrules',
-                  'easylistdutch',
-                  'facebookfilters',
-                  'antiadblockfilters'
-                 ]:
+                  'easylistgermany',
+                  'easylistitaly',
+                  'easylistcombinations',
+                  'malwaredomains',
+                  'ruadlist',
+                  'listefr',
+                  'exceptionrules',
+                  'easylistdutch',
+                  'facebookfilters',
+                  'antiadblockfilters'
+     ]:
   }  
 
   cron {'update_subscription':
     ensure => present,
     command => "python -m sitescripts.subscriptions.bin.updateSubscriptionDownloads 3>&1 1>/dev/null 2>&3 | perl -pe 's/^/\"[\" . scalar localtime() . \"] \"/e' >> /tmp/subscription_errors && chmod 666 /tmp/subscription_errors 2>/dev/null",
     user => rsync,
-    require => [
-    User['rsync']
-    ],
+    require => User['rsync'],
     minute => '*/10'
   }
-                 
+     
   cron {'update_malware':
     ensure => present,
     command => "python -m sitescripts.subscriptions.bin.updateMalwareDomainsList",
     user => rsync,
-    require => [
-    User['rsync']
-    ],
+    require => User['rsync'],
     hour => '*/6',
     minute => 15
   }
   
   cron {'update_repos':
     ensure => present,
-    command => "/home/rsync/update_repos.sh 1>/dev/null",
+    command => "/home/rsync/update_repos.sh",
     user => rsync,
     require => [
-    User['rsync'],
-    File['/home/rsync/update_repos.sh']
+      User['rsync'],
+      File['/home/rsync/update_repos.sh']
     ],
-    minute  => '*/5'

[Wladimir Palant, 2013/11/12 13:04:03]

It doesn't make sense to update repositories at the same time when subscriptions
are being generated. It also doesn't make sense to update repositories twice as
frequently as subscriptions are being generated. I think you want minute =>
'8-58/10'

+    minute  => '8-58/10'
   }
 
   class {'sitescripts':
     sitescriptsini_source => 'puppet:///modules/filtermaster/sitescripts'
   }
-}       
+}