| OLD | NEW | 
|---|
| 1 # == Class: adblockplus | 1 # == Class: adblockplus | 
| 2 # | 2 # | 
| 3 # The adblockplus class and the associated adblockplus:: namespace are | 3 # The adblockplus class and the associated adblockplus:: namespace are | 
| 4 # used to integrate Puppet modules with each other, in order to assemble | 4 # used to integrate Puppet modules with each other, in order to assemble | 
| 5 # the setups used by the Adblock Plus project. | 5 # the setups used by the Adblock Plus project. | 
| 6 # | 6 # | 
| 7 # === Parameters: | 7 # === Parameters: | 
| 8 # | 8 # | 
| 9 # [*users*] | 9 # [*users*] | 
| 10 #   A hash of adblockplus::user $name => $parameter items to set up in this | 10 #   A hash of adblockplus::user $name => $parameter items to set up in this | 
| 11 #   context, i.e. via Hiera. | 11 #   context, i.e. via Hiera. | 
| 12 # | 12 # | 
| 13 # === Examples: | 13 # === Examples: | 
| 14 # | 14 # | 
| 15 #   class {'adblockplus': | 15 #   class {'adblockplus': | 
| 16 #     users => { | 16 #     users => { | 
| 17 #       'pinocchio' => { | 17 #       'pinocchio' => { | 
| 18 #         # see adblockplus::user | 18 #         # see adblockplus::user | 
| 19 #       }, | 19 #       }, | 
| 20 #     }, | 20 #     }, | 
| 21 #   } | 21 #   } | 
| 22 # | 22 # | 
| 23 class adblockplus ( | 23 class adblockplus ( | 
| 24   $users = hiera('adblockplus::users', []), | 24   $users = hiera('adblockplus::users', []), | 
| 25 ) { | 25 ) { | 
| 26 | 26 | 
|  | 27   # See https://issues.adblockplus.org/ticket/3574#comment:4 | 
|  | 28   include base | 
|  | 29 | 
| 27   # Used as internal constant within adblockplus::* resources | 30   # Used as internal constant within adblockplus::* resources | 
| 28   $directory = '/var/adblockplus' | 31   $directory = '/var/adblockplus' | 
| 29 | 32 | 
| 30   # A common location for directories specific to the adblockplus:: setups, | 33   # A common location for directories specific to the adblockplus:: setups, | 
| 31   # managed via Puppet, but accessible by all users with access to the system | 34   # managed via Puppet, but accessible by all users with access to the system | 
| 32   @file {$directory: | 35   @file {$directory: | 
| 33     ensure => 'directory', | 36     ensure => 'directory', | 
| 34     mode => 0755, | 37     mode => 0755, | 
| 35     owner => 'root', | 38     owner => 'root', | 
| 36   } | 39   } | 
| 37 | 40 | 
| 38   # See modules/adblockplus/manifests/user.pp | 41   # See modules/adblockplus/manifests/user.pp | 
| 39   create_resources('adblockplus::user', $users) | 42   create_resources('adblockplus::user', $users) | 
| 40 } | 43 } | 
| OLD | NEW | 
|---|