| 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 27 matching lines...) Expand all Loading... |
| 38 $hosts = hiera_hash('adblockplus::hosts', {}), | 38 $hosts = hiera_hash('adblockplus::hosts', {}), |
| 39 $packages = hiera_array('adblockplus::packages', []), | 39 $packages = hiera_array('adblockplus::packages', []), |
| 40 $users = hiera_hash('adblockplus::users', {}), | 40 $users = hiera_hash('adblockplus::users', {}), |
| 41 ) { | 41 ) { |
| 42 | 42 |
| 43 # See https://issues.adblockplus.org/ticket/3574#comment:8 | 43 # See https://issues.adblockplus.org/ticket/3574#comment:8 |
| 44 class {'base': | 44 class {'base': |
| 45 zone => $authority, | 45 zone => $authority, |
| 46 } | 46 } |
| 47 | 47 |
| 48 # See https://issues.adblockplus.org/ticket/3575#comment:2 |
| 49 class {'logrotate': |
| 50 stage => 'runtime', |
| 51 } |
| 52 |
| 48 # Class['apt'] cannot yet be configured to update on-demand | 53 # Class['apt'] cannot yet be configured to update on-demand |
| 49 class {'apt': | 54 class {'apt': |
| 50 always_apt_update => ($environment != 'development'), | 55 always_apt_update => ($environment != 'development'), |
| 51 } | 56 } |
| 52 | 57 |
| 53 # Used as internal constant within adblockplus::* resources | 58 # Used as internal constant within adblockplus::* resources |
| 54 $directory = '/var/adblockplus' | 59 $directory = '/var/adblockplus' |
| 55 | 60 |
| 56 # A common location for directories specific to the adblockplus:: setups, | 61 # A common location for directories specific to the adblockplus:: setups, |
| 57 # managed via Puppet, but accessible by all users with access to the system | 62 # managed via Puppet, but accessible by all users with access to the system |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 ensure => 'present', | 114 ensure => 'present', |
| 110 mode => 0644, | 115 mode => 0644, |
| 111 }) | 116 }) |
| 112 | 117 |
| 113 # See modules/adblockplus/manifests/host.pp | 118 # See modules/adblockplus/manifests/host.pp |
| 114 create_resources('adblockplus::host', $hosts) | 119 create_resources('adblockplus::host', $hosts) |
| 115 | 120 |
| 116 # See modules/adblockplus/manifests/user.pp | 121 # See modules/adblockplus/manifests/user.pp |
| 117 create_resources('adblockplus::user', $users) | 122 create_resources('adblockplus::user', $users) |
| 118 } | 123 } |
| OLD | NEW |