Side by Side Diff: modules/web/manifests/server.pp
Issue 29827555:
#13108 - Ensure web content repository source to be checked out (Closed)
Patch Set:
Created July 11, 2018, 8:14 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 = 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, |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 108 | 108 |
| 109 exec {"fetch_cms": | 109 exec {"fetch_cms": |
| 110 command => shellquote($fetch_cms_cmd), | 110 command => shellquote($fetch_cms_cmd), |
| 111 require => Class['adblockplus::mercurial'], | 111 require => Class['adblockplus::mercurial'], |
| 112 timeout => 0, | 112 timeout => 0, |
| 113 creates => "/opt/cms/.hg/hgrc", | 113 creates => "/opt/cms/.hg/hgrc", |
| 114 } | 114 } |
| 115 | 115 |
| 116 $fetch_repo_cmd = [ | 116 $fetch_repo_cmd = [ |
| 117 'hg', 'clone', | 117 'hg', 'clone', |
| 118 '--noupdate', | |
| 119 $remote, | 118 $remote, |
| 120 "/home/www/${repository}", | 119 "/home/www/${repository}", |
| 121 ] | 120 ] |
| 122 | 121 |
| 123 exec {"fetch_repo": | 122 exec {"fetch_repo": |
| 124 command => shellquote($fetch_repo_cmd), | 123 command => shellquote($fetch_repo_cmd), |
| 125 require => Class['adblockplus::mercurial'], | 124 require => Class['adblockplus::mercurial'], |
| 126 user => www, | 125 user => www, |
| 127 timeout => 0, | 126 timeout => 0, |
| 128 creates => "/home/www/${repository}/.hg/hgrc", | 127 creates => "/home/www/${repository}/.hg/hgrc", |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 179 ) | 178 ) |
| 180 | 179 |
| 181 cron {'update_repo': | 180 cron {'update_repo': |
| 182 ensure => present, | 181 ensure => present, |
| 183 command => $update_webpage_cmd, | 182 command => $update_webpage_cmd, |
| 184 user => www, | 183 user => www, |
| 185 minute => '5-59/20', | 184 minute => '5-59/20', |
| 186 } | 185 } |
| 187 | 186 |
| 188 } | 187 } |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
