| 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 | 45 |
| 46 include postfix | 46 include postfix |
| 47 include ssh | 47 include ssh |
| 48 include stdlib | 48 include stdlib |
| 49 | 49 |
| 50 # See https://issues.adblockplus.org/ticket/3575#comment:2 | 50 # See https://issues.adblockplus.org/ticket/3575#comment:2 |
| 51 class {'logrotate': | 51 class {'logrotate': |
| 52 stage => 'runtime', | 52 stage => 'runtime', |
| 53 } | 53 } |
| 54 | 54 |
| 55 # Class['apt'] cannot yet be configured to update on-demand | |
| 56 class {'apt': | |
| 57 always_apt_update => ($environment != 'development'), | |
| 58 } | |
| 59 | |
| 60 # Used as internal constant within adblockplus::* resources | 55 # Used as internal constant within adblockplus::* resources |
| 61 $directory = '/var/adblockplus' | 56 $directory = '/var/adblockplus' |
| 62 | 57 |
| 63 # A common location for directories specific to the adblockplus:: setups, | 58 # A common location for directories specific to the adblockplus:: setups, |
| 64 # managed via Puppet, but accessible by all users with access to the system | 59 # managed via Puppet, but accessible by all users with access to the system |
| 65 @file {$directory: | 60 @file {$directory: |
| 66 ensure => 'directory', | 61 ensure => 'directory', |
| 67 mode => 0755, | 62 mode => 0755, |
| 68 owner => 'root', | 63 owner => 'root', |
| 69 } | 64 } |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 ensure => 'present', | 121 ensure => 'present', |
| 127 mode => 0644, | 122 mode => 0644, |
| 128 }) | 123 }) |
| 129 | 124 |
| 130 # See modules/adblockplus/manifests/host.pp | 125 # See modules/adblockplus/manifests/host.pp |
| 131 create_resources('adblockplus::host', $hosts) | 126 create_resources('adblockplus::host', $hosts) |
| 132 | 127 |
| 133 # See modules/adblockplus/manifests/user.pp | 128 # See modules/adblockplus/manifests/user.pp |
| 134 create_resources('adblockplus::user', $users) | 129 create_resources('adblockplus::user', $users) |
| 135 } | 130 } |
| OLD | NEW |