Issue 3065 - Refactor adblockplus::puppet module to include Puppet patches

modules/adblockplus/manifests/init.pp

 # == Class: adblockplus
 #
 # The adblockplus class and the associated adblockplus:: namespace are
 # used to integrate Puppet modules with each other, in order to assemble
 # the setups used by the Adblock Plus project.
 #
 # === Parameters:
 #
 # [*authority*]
 #   The authorative domain or zone associated with the current environment.
@@ skipping 25 matching lines @@
 #     },
 #   }
 #
 class adblockplus (
   $authority = hiera('adblockplus::authority', 'adblockplus.org'),
   $hosts = hiera_hash('adblockplus::hosts', {}),
   $packages = hiera_array('adblockplus::packages', []),
   $users = hiera_hash('adblockplus::users', {}),
 ) {
 
-  include adblockplus::puppet
   include postfix
   include ssh
   include stdlib
 
   # See https://issues.adblockplus.org/ticket/3575#comment:2
   class {'logrotate':
     stage => 'runtime',
   }
 
   # Class['apt'] cannot yet be configured to update on-demand
@@ skipping 50 matching lines @@
   }
 
   # Fix implicit package dependency Class['apt'] does not properly handle
   Exec['apt_update'] -> Package<|title != 'python-software-properties'|>
 
   # https://issues.adblockplus.org/ticket/3574#comment:19
   ensure_packages($packages)
 
   # https://projects.puppetlabs.com/issues/4145
   ensure_resource('file', '/etc/ssh/ssh_known_hosts', {
-    ensure => 'present',
-    mode => 0644,
+    'ensure' => 'present',
+    'group' => 'root',
+    'mode' => 0644,
+    'owner' => 'root',

[mathias, 2016/12/15 10:01:10]

Accidental change, removed this one.

   })
 
   # See modules/adblockplus/manifests/host.pp
   create_resources('adblockplus::host', $hosts)
 
   # See modules/adblockplus/manifests/user.pp
   create_resources('adblockplus::user', $users)
 }