Side by Side Diff: modules/web/manifests/server.pp
Issue 29326028:
Issue 2999 - Integrate web::server SSL parameters with Hiera (Closed)
Patch Set:
Created Sept. 7, 2015, 10:42 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
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')
| OLD | NEW |
|---|---|
| 1 class web::server( | 1 class web::server( |
| 2 $vhost, | 2 $vhost, |
| 3 $repository, | 3 $repository, |
| 4 $certificate, | 4 $certificate = hiera('web::server::certificate'), |
| 5 $private_key, | 5 $private_key = hiera('web::server::private_key'), |
| 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 File { | 10 File { |
| 11 owner => 'root', | 11 owner => 'root', |
| 12 group => 'root', | 12 group => 'root', |
| 13 mode => 0644, | 13 mode => 0644, |
| 14 } | 14 } |
| 15 | 15 |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 93 minute => '5-55/10', | 93 minute => '5-55/10', |
| 94 } | 94 } |
| 95 | 95 |
| 96 cron {'update_repo': | 96 cron {'update_repo': |
| 97 ensure => present, | 97 ensure => present, |
| 98 command => "hg pull -q -R /home/www/${repository} && python -m cms.bin.gener ate_static_pages /home/www/${repository} /var/www/${vhost}", | 98 command => "hg pull -q -R /home/www/${repository} && python -m cms.bin.gener ate_static_pages /home/www/${repository} /var/www/${vhost}", |
| 99 user => www, | 99 user => www, |
| 100 minute => '*/10', | 100 minute => '*/10', |
| 101 } | 101 } |
| 102 } | 102 } |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
