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

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

Issue 29469611: #1634 - Update file resource syntax in module hgweb (Closed)
Left Patch Set: Created June 20, 2017, 4:56 p.m.
Right Patch Set: For comment number 2 Created June 21, 2017, 9:57 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 | no next file » | 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: hgweb 1 # == Class: hgweb
2 # 2 #
3 # A hgweb server setup. 3 # A hgweb server setup.
4 # 4 #
5 # === Parameters: 5 # === Parameters:
6 # 6 #
7 # [*domain*] 7 # [*domain*]
8 # The auhority part of the URL the instance is associated with. 8 # The auhority part of the URL the instance is associated with.
9 # 9 #
10 # [*is_default*] 10 # [*is_default*]
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 X11Forwarding no 134 X11Forwarding no
135 AllowAgentForwarding no 135 AllowAgentForwarding no
136 GatewayPorts no 136 GatewayPorts no
137 ForceCommand cd ~/web && PYTHONPATH=/opt/sitescripts hg-ssh $HGREPOS 137 ForceCommand cd ~/web && PYTHONPATH=/opt/sitescripts hg-ssh $HGREPOS
138 ', 138 ',
139 order => '99', 139 order => '99',
140 target => 'sshd_config', 140 target => 'sshd_config',
141 } 141 }
142 142
143 file {'/etc/hgweb.ini': 143 file {'/etc/hgweb.ini':
144 mode => '644', 144 mode => '0644',
mathias 2017/06/20 17:01:44 Now that we're at it, can't we make it uniform and
145 require => Package[$required_packages], 145 require => Package[$required_packages],
146 source => 'puppet:///modules/hgweb/hgweb.ini', 146 source => 'puppet:///modules/hgweb/hgweb.ini',
147 } 147 }
148 148
149 file {'/opt/hgweb.fcgi': 149 file {'/opt/hgweb.fcgi':
150 mode => '755', 150 mode => '0755',
151 require => File['/etc/hgweb.ini'], 151 require => File['/etc/hgweb.ini'],
152 source => 'puppet:///modules/hgweb/hgweb.fcgi', 152 source => 'puppet:///modules/hgweb/hgweb.fcgi',
153 } 153 }
154 154
155 if $::operatingsystem == "Debian" { 155 if $::operatingsystem == "Debian" {
156 file {'init_script': 156 file {'init_script':
157 name => '/etc/systemd/system/hgweb.service', 157 name => '/etc/systemd/system/hgweb.service',
158 mode => '755', 158 mode => '0755',
159 require => File['/opt/hgweb.fcgi'], 159 require => File['/opt/hgweb.fcgi'],
160 source => 'puppet:///modules/hgweb/hgweb.service', 160 source => 'puppet:///modules/hgweb/hgweb.service',
161 } 161 }
162 } else { 162 } else {
163 file {'init_script': 163 file {'init_script':
164 name => '/etc/init.d/hgweb', 164 name => '/etc/init.d/hgweb',
165 mode => '755', 165 mode => '0755',
166 require => File['/opt/hgweb.fcgi'], 166 require => File['/opt/hgweb.fcgi'],
167 source => 'puppet:///modules/hgweb/hgweb.sh', 167 source => 'puppet:///modules/hgweb/hgweb.sh',
168 } 168 }
169 } 169 }
170 170
171 file {'/home/hg/web/robots.txt': 171 file {'/home/hg/web/robots.txt':
172 group => 'hg', 172 group => 'hg',
173 mode => '0644', 173 mode => '0644',
174 owner => 'hg', 174 owner => 'hg',
175 require => File['/home/hg/web'], 175 require => File['/home/hg/web'],
(...skipping 22 matching lines...) Expand all
198 content => template('hgweb/nginx.conf.erb'), 198 content => template('hgweb/nginx.conf.erb'),
199 is_default => $is_default, 199 is_default => $is_default,
200 global_config => template('hgweb/nginx_global.conf.erb'), 200 global_config => template('hgweb/nginx_global.conf.erb'),
201 log => 'access_log_hg', 201 log => 'access_log_hg',
202 private_key => $private_key ? { 202 private_key => $private_key ? {
203 'undef' => undef, 203 'undef' => undef,
204 default => $private_key, 204 default => $private_key,
205 }, 205 },
206 } 206 }
207 } 207 }
LEFTRIGHT
« no previous file | no next file » | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld