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

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

Issue 29469584: #1634 - Update file resource syntax in module adblockplus (Closed)
Left Patch Set: Created June 20, 2017, 4:42 p.m.
Right Patch Set: Created June 21, 2017, 10:15 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/log.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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 group => 'root', 96 group => 'root',
97 mode => '0644', 97 mode => '0644',
98 } 98 }
99 99
100 # Work around https://issues.adblockplus.org/ticket/3479 100 # Work around https://issues.adblockplus.org/ticket/3479
101 if $::environment == 'development' { 101 if $::environment == 'development' {
102 102
103 file { 103 file {
104 '/etc/ssh/ssh_host_rsa_key': 104 '/etc/ssh/ssh_host_rsa_key':
105 source => 'puppet:///modules/adblockplus/development_host_rsa_key', 105 source => 'puppet:///modules/adblockplus/development_host_rsa_key',
106 mode => '600', 106 mode => '0600',
mathias 2017/06/20 17:09:02 Now that we're at it, can't we make it uniform and
107 notify => Service['ssh']; 107 notify => Service['ssh'];
108 '/etc/ssh/ssh_host_rsa_key.pub': 108 '/etc/ssh/ssh_host_rsa_key.pub':
109 source => 'puppet:///modules/adblockplus/development_host_rsa_key.pub', 109 source => 'puppet:///modules/adblockplus/development_host_rsa_key.pub',
110 mode => '644'; 110 mode => '0644',
111 } 111 }
112 } 112 }
113 113
114 # Fix implicit package dependency Class['apt'] does not properly handle 114 # Fix implicit package dependency Class['apt'] does not properly handle
115 Exec['apt_update'] -> Package<|title != 'python-software-properties'|> 115 Exec['apt_update'] -> Package<|title != 'python-software-properties'|>
116 116
117 # https://issues.adblockplus.org/ticket/3574#comment:19 117 # https://issues.adblockplus.org/ticket/3574#comment:19
118 ensure_packages($packages) 118 ensure_packages($packages)
119 119
120 # https://projects.puppetlabs.com/issues/4145 120 # https://projects.puppetlabs.com/issues/4145
121 ensure_resource('file', '/etc/ssh/ssh_known_hosts', { 121 ensure_resource('file', '/etc/ssh/ssh_known_hosts', {
122 ensure => 'present', 122 ensure => 'present',
123 mode => '0644', 123 mode => '0644',
124 }) 124 })
125 125
126 # See modules/adblockplus/manifests/host.pp 126 # See modules/adblockplus/manifests/host.pp
127 create_resources('adblockplus::host', $hosts) 127 create_resources('adblockplus::host', $hosts)
128 128
129 # See modules/adblockplus/manifests/user.pp 129 # See modules/adblockplus/manifests/user.pp
130 create_resources('adblockplus::user', $users) 130 create_resources('adblockplus::user', $users)
131 } 131 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld