| 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::legacy |
| 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 # Used as internal constant within adblockplus::* resources | 56 # Used as internal constant within adblockplus::* resources |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 ensure => 'present', | 122 ensure => 'present', |
| 122 mode => 0644, | 123 mode => 0644, |
| 123 }) | 124 }) |
| 124 | 125 |
| 125 # See modules/adblockplus/manifests/host.pp | 126 # See modules/adblockplus/manifests/host.pp |
| 126 create_resources('adblockplus::host', $hosts) | 127 create_resources('adblockplus::host', $hosts) |
| 127 | 128 |
| 128 # See modules/adblockplus/manifests/user.pp | 129 # See modules/adblockplus/manifests/user.pp |
| 129 create_resources('adblockplus::user', $users) | 130 create_resources('adblockplus::user', $users) |
| 130 } | 131 } |
| OLD | NEW |