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

Delta Between Two Patch Sets: modules/adblockplus/manifests/init.pp

Issue 29367556: Issue 3065 - Refactor adblockplus::puppet module to include Puppet patches (Closed)
Left Patch Set: Created Dec. 15, 2016, 9:58 a.m.
Right Patch Set: (remove accidental changes) Created Dec. 15, 2016, 10 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | modules/adblockplus/manifests/puppet.pp » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 } 106 }
107 107
108 # Fix implicit package dependency Class['apt'] does not properly handle 108 # Fix implicit package dependency Class['apt'] does not properly handle
109 Exec['apt_update'] -> Package<|title != 'python-software-properties'|> 109 Exec['apt_update'] -> Package<|title != 'python-software-properties'|>
110 110
111 # https://issues.adblockplus.org/ticket/3574#comment:19 111 # https://issues.adblockplus.org/ticket/3574#comment:19
112 ensure_packages($packages) 112 ensure_packages($packages)
113 113
114 # https://projects.puppetlabs.com/issues/4145 114 # https://projects.puppetlabs.com/issues/4145
115 ensure_resource('file', '/etc/ssh/ssh_known_hosts', { 115 ensure_resource('file', '/etc/ssh/ssh_known_hosts', {
116 'ensure' => 'present', 116 ensure => 'present',
117 'group' => 'root', 117 mode => 0644,
118 'mode' => 0644,
119 'owner' => 'root',
mathias 2016/12/15 10:01:10 Accidental change, removed this one.
120 }) 118 })
121 119
122 # See modules/adblockplus/manifests/host.pp 120 # See modules/adblockplus/manifests/host.pp
123 create_resources('adblockplus::host', $hosts) 121 create_resources('adblockplus::host', $hosts)
124 122
125 # See modules/adblockplus/manifests/user.pp 123 # See modules/adblockplus/manifests/user.pp
126 create_resources('adblockplus::user', $users) 124 create_resources('adblockplus::user', $users)
127 } 125 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld