Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: modules/adblockplus/manifests/init.pp

Issue 29366882: Issue 3574 - Refactor Puppet class base into class adblockplus (Closed)
Patch Set: Created Dec. 6, 2016, 10:40 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
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,
11 # similar to the deprecated and soon to be removed $base::zone. 11 # similar to the deprecated and soon to be removed $base::zone.
mathias 2016/12/06 10:52:55 This line can be removed now.
f.lopez 2016/12/06 11:34:42 Acknowledged.
12 # 12 #
13 # [*hosts*] 13 # [*hosts*]
14 # A hash of adblockplus::host $name => $parameter items to set up in this 14 # A hash of adblockplus::host $name => $parameter items to set up in this
15 # context, i.e. via Hiera. 15 # context, i.e. via Hiera.
16 # 16 #
17 # [*users*] 17 # [*users*]
18 # A hash of adblockplus::user $name => $parameter items to set up in this 18 # A hash of adblockplus::user $name => $parameter items to set up in this
19 # context, i.e. via Hiera. 19 # context, i.e. via Hiera.
20 # 20 #
21 # === Examples: 21 # === Examples:
(...skipping 15 matching lines...) Expand all
37 $authority = hiera('adblockplus::authority', 'adblockplus.org'), 37 $authority = hiera('adblockplus::authority', 'adblockplus.org'),
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 include postfix 43 include postfix
44 include ssh 44 include ssh
45 include stdlib 45 include stdlib
46 46
47 # See https://issues.adblockplus.org/ticket/3574#comment:8
48 class {'base':
49 zone => $authority,
50 }
51
52 # See https://issues.adblockplus.org/ticket/3575#comment:2 47 # See https://issues.adblockplus.org/ticket/3575#comment:2
53 class {'logrotate': 48 class {'logrotate':
54 stage => 'runtime', 49 stage => 'runtime',
55 } 50 }
56 51
57 # Class['apt'] cannot yet be configured to update on-demand 52 # Class['apt'] cannot yet be configured to update on-demand
58 class {'apt': 53 class {'apt':
59 always_apt_update => ($environment != 'development'), 54 always_apt_update => ($environment != 'development'),
60 } 55 }
61 56
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 ensure => 'present', 113 ensure => 'present',
119 mode => 0644, 114 mode => 0644,
120 }) 115 })
121 116
122 # See modules/adblockplus/manifests/host.pp 117 # See modules/adblockplus/manifests/host.pp
123 create_resources('adblockplus::host', $hosts) 118 create_resources('adblockplus::host', $hosts)
124 119
125 # See modules/adblockplus/manifests/user.pp 120 # See modules/adblockplus/manifests/user.pp
126 create_resources('adblockplus::user', $users) 121 create_resources('adblockplus::user', $users)
127 } 122 }
OLDNEW

Powered by Google App Engine
This is Rietveld