| 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 # [*authority*] | 9 # [*authority*] | 
| 10 #   The authorative domain or zone associated with the current environment. | 10 #   The authorative domain or zone associated with the current environment. | 
| (...skipping 25 matching lines...) Expand all  Loading... | 
| 36 #     }, | 36 #     }, | 
| 37 #   } | 37 #   } | 
| 38 # | 38 # | 
| 39 class adblockplus ( | 39 class adblockplus ( | 
| 40   $authority = hiera('adblockplus::authority', 'adblockplus.org'), | 40   $authority = hiera('adblockplus::authority', 'adblockplus.org'), | 
| 41   $hosts = hiera_hash('adblockplus::hosts', {}), | 41   $hosts = hiera_hash('adblockplus::hosts', {}), | 
| 42   $packages = hiera_array('adblockplus::packages', []), | 42   $packages = hiera_array('adblockplus::packages', []), | 
| 43   $users = hiera_hash('adblockplus::users', {}), | 43   $users = hiera_hash('adblockplus::users', {}), | 
| 44 ) { | 44 ) { | 
| 45 | 45 | 
|  | 46   include adblockplus::puppet | 
| 46   include postfix | 47   include postfix | 
| 47   include ssh | 48   include ssh | 
| 48   include stdlib | 49   include stdlib | 
| 49 | 50 | 
| 50   # See https://issues.adblockplus.org/ticket/3575#comment:2 | 51   # See https://issues.adblockplus.org/ticket/3575#comment:2 | 
| 51   class {'logrotate': | 52   class {'logrotate': | 
| 52     stage => 'runtime', | 53     stage => 'runtime', | 
| 53   } | 54   } | 
| 54 | 55 | 
| 55   # Class['apt'] cannot yet be configured to update on-demand | 56   # Class['apt'] cannot yet be configured to update on-demand | 
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 116     ensure => 'present', | 117     ensure => 'present', | 
| 117     mode => 0644, | 118     mode => 0644, | 
| 118   }) | 119   }) | 
| 119 | 120 | 
| 120   # See modules/adblockplus/manifests/host.pp | 121   # See modules/adblockplus/manifests/host.pp | 
| 121   create_resources('adblockplus::host', $hosts) | 122   create_resources('adblockplus::host', $hosts) | 
| 122 | 123 | 
| 123   # See modules/adblockplus/manifests/user.pp | 124   # See modules/adblockplus/manifests/user.pp | 
| 124   create_resources('adblockplus::user', $users) | 125   create_resources('adblockplus::user', $users) | 
| 125 } | 126 } | 
| OLD | NEW | 
|---|