Delta Between Two Patch Sets: modules/web/manifests/server.pp
Issue 29785567:
#11294 - Generate and store anonymized HTTPd logs (Closed)
Left Patch Set:
Created May 18, 2018, 3:16 p.m.
Right Patch Set: #11294 - Include input MD5 sum with archive file names
Created June 5, 2018, 2:29 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« modules/private-stub/hiera/base.yaml ('k')
|
no next file »
|
no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| 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, | |
|
Fred
2018/05/25 09:48:04
Do we still need this parameter?
| |
| 11 ) { | 10 ) { |
| 12 | 11 |
| 13 include sitescripts | 12 include sitescripts |
| 14 include adblockplus::web | 13 include adblockplus::web |
| 15 include geoip | 14 include geoip |
| 16 | 15 |
| 17 $remote = hiera('web::server::remote', "https://hg.adblockplus.org/${repositor y}") | 16 $remote = hiera('web::server::remote', "https://hg.adblockplus.org/${repositor y}") |
| 18 | 17 |
| 19 $pythonpath = 'PYTHONPATH=/opt/cms:/opt/sitescripts' | 18 $pythonpath = 'PYTHONPATH=/opt/cms:/opt/sitescripts' |
| 20 | 19 |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 172 ) | 171 ) |
| 173 | 172 |
| 174 cron {'update_repo': | 173 cron {'update_repo': |
| 175 ensure => present, | 174 ensure => present, |
| 176 command => $update_webpage_cmd, | 175 command => $update_webpage_cmd, |
| 177 user => www, | 176 user => www, |
| 178 minute => '5-59/20', | 177 minute => '5-59/20', |
| 179 } | 178 } |
| 180 | 179 |
| 181 } | 180 } |
| LEFT | RIGHT |
« modules/private-stub/hiera/base.yaml ('k')
|
no next file »
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
