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

Side by Side Diff: modules/web/manifests/server.pp

Issue 29438564: #301 - Provision formmail templates with absolute paths (Closed)
Patch Set: Created May 16, 2017, 12:29 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
OLDNEW
1 class web::server( 1 class web::server(
2 $vhost, 2 $vhost,
3 $repository, 3 $repository,
4 $certificate = hiera('web::server::certificate', 'undef'), 4 $certificate = hiera('web::server::certificate', 'undef'),
5 $private_key = hiera('web::server::private_key', 'undef'), 5 $private_key = hiera('web::server::private_key', 'undef'),
6 $is_default = false, 6 $is_default = false,
7 $aliases = undef, 7 $aliases = undef,
8 $custom_config = undef, 8 $custom_config = undef,
9 $multiplexer_locations = undef, 9 $multiplexer_locations = undef,
10 $geoip = false, 10 $geoip = false,
11 $formmail = hiera('web::server::formmail', undef),
11 ) { 12 ) {
12 13
13 include sitescripts 14 include sitescripts
14 15
16 if $formmail != undef {
17 ensure_resource('file', 'formmail', merge({
18 ensure => absent,
mathias 2017/05/16 20:59:48 Do you really think ensure => "absent" is a reason
19 }, $formmail))
20 }
21
15 $PYTHONPATH = 'PYTHONPATH=/opt/cms:/opt/sitescripts' 22 $PYTHONPATH = 'PYTHONPATH=/opt/cms:/opt/sitescripts'
16 23
17 # Ensure there is at least one character in the respective strings; 24 # Ensure there is at least one character in the respective strings;
18 # see https://codereview.adblockplus.org/29329028/#msg3 25 # see https://codereview.adblockplus.org/29329028/#msg3
19 validate_re($vhost, '.+') 26 validate_re($vhost, '.+')
20 validate_re($repository, '.+') 27 validate_re($repository, '.+')
21 28
22 File { 29 File {
23 owner => 'root', 30 owner => 'root',
24 group => 'root', 31 group => 'root',
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 ) 171 )
165 172
166 cron {'update_repo': 173 cron {'update_repo':
167 ensure => present, 174 ensure => present,
168 command => $update_webpage_cmd, 175 command => $update_webpage_cmd,
169 user => www, 176 user => www,
170 minute => '5-59/20', 177 minute => '5-59/20',
171 } 178 }
172 179
173 } 180 }
OLDNEW
« hiera/roles/web/acceptableads.yaml ('K') | « hiera/roles/web/acceptableads.yaml ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld