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

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

Issue 29340814: Issue 3574 - Inclde postfix, ssh, stdlib from class adblockplus (Closed)
Patch Set: Created April 25, 2016, 6:43 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
« no previous file with comments | « no previous file | modules/base/manifests/init.pp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,
(...skipping 22 matching lines...) Expand all
33 # }, 33 # },
34 # } 34 # }
35 # 35 #
36 class adblockplus ( 36 class adblockplus (
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
44 include ssh
45 include stdlib
46
43 # See https://issues.adblockplus.org/ticket/3574#comment:8 47 # See https://issues.adblockplus.org/ticket/3574#comment:8
44 class {'base': 48 class {'base':
45 zone => $authority, 49 zone => $authority,
46 } 50 }
47 51
48 # Class['apt'] cannot yet be configured to update on-demand 52 # Class['apt'] cannot yet be configured to update on-demand
49 class {'apt': 53 class {'apt':
50 always_apt_update => ($environment != 'development'), 54 always_apt_update => ($environment != 'development'),
51 } 55 }
52 56
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 ensure => 'present', 113 ensure => 'present',
110 mode => 0644, 114 mode => 0644,
111 }) 115 })
112 116
113 # See modules/adblockplus/manifests/host.pp 117 # See modules/adblockplus/manifests/host.pp
114 create_resources('adblockplus::host', $hosts) 118 create_resources('adblockplus::host', $hosts)
115 119
116 # See modules/adblockplus/manifests/user.pp 120 # See modules/adblockplus/manifests/user.pp
117 create_resources('adblockplus::user', $users) 121 create_resources('adblockplus::user', $users)
118 } 122 }
OLDNEW
« no previous file with comments | « no previous file | modules/base/manifests/init.pp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld