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

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

Issue 29329312: Issue 3115 - Integrate customservice::supervisor with hgweb (Closed)
Left Patch Set: Created Oct. 20, 2015, 10:59 p.m.
Right Patch Set: Address feedback from #3211 codereview Created Oct. 28, 2015, 6:47 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
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
(no file at all)
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 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 service {'hgweb': 164 service {'hgweb':
165 enable => true, 165 enable => true,
166 ensure => 'running', 166 ensure => 'running',
167 hasrestart => true, 167 hasrestart => true,
168 hasstatus => false, 168 hasstatus => false,
169 pattern => 'hgweb.fcgi', 169 pattern => 'hgweb.fcgi',
170 require => File['/etc/init.d/hgweb'], 170 require => File['/etc/init.d/hgweb'],
171 subscribe => File['/etc/hgweb.ini'], 171 subscribe => File['/etc/hgweb.ini'],
172 } 172 }
173 173
174 customservice::supervisor {'hgweb':
175 ensure => 'present',
176 }
177
174 nginx::hostconfig {$domain: 178 nginx::hostconfig {$domain:
175 certificate => $certificate ? { 179 certificate => $certificate ? {
176 'undef' => undef, 180 'undef' => undef,
177 default => $certificate, 181 default => $certificate,
178 }, 182 },
179 content => template('hgweb/nginx.conf.erb'), 183 content => template('hgweb/nginx.conf.erb'),
180 is_default => $is_default, 184 is_default => $is_default,
181 global_config => template('hgweb/nginx_global.conf.erb'), 185 global_config => template('hgweb/nginx_global.conf.erb'),
182 log => 'access_log_hg', 186 log => 'access_log_hg',
183 private_key => $private_key ? { 187 private_key => $private_key ? {
184 'undef' => undef, 188 'undef' => undef,
185 default => $private_key, 189 default => $private_key,
186 }, 190 },
187 } 191 }
188 } 192 }
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