Delta Between Two Patch Sets: modules/web/manifests/server.pp
Issue 29438574:
Noissue - Improve CMS repository clone command (Closed)
Left Patch Set:
Created May 16, 2017, 1:04 a.m.
Right Patch Set: For comment 2
Created May 16, 2017, 7:18 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« 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') | 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, | 10 $geoip = false, |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 93 } | 93 } |
| 94 | 94 |
| 95 user {'www': | 95 user {'www': |
| 96 ensure => present, | 96 ensure => present, |
| 97 comment => 'Web content owner', | 97 comment => 'Web content owner', |
| 98 home => '/home/www', | 98 home => '/home/www', |
| 99 managehome => true, | 99 managehome => true, |
| 100 } | 100 } |
| 101 | 101 |
| 102 $fetch_cms_cmd = [ | 102 $fetch_cms_cmd = [ |
| 103 "hg", "clone", "https://hg.adblockplus.org/cms/", "/opt/cms", | 103 'hg', 'clone', |
|
mathias
2017/05/16 09:01:33
Please use single quotes.
| |
| 104 'https://hg.adblockplus.org/cms/', | |
| 105 '/opt/cms', | |
| 104 ] | 106 ] |
| 105 | 107 |
| 106 exec {"fetch_cms": | 108 exec {"fetch_cms": |
| 107 command => shellquote($fetch_cms_cmd), | 109 command => shellquote($fetch_cms_cmd), |
| 108 path => ["/usr/bin/", "/bin/"], | 110 path => ["/usr/bin/", "/bin/"], |
| 109 require => Package['mercurial'], | 111 require => Package['mercurial'], |
| 110 timeout => 0, | 112 timeout => 0, |
| 111 creates => "/opt/cms/.hg/hgrc", | 113 creates => "/opt/cms/.hg/hgrc", |
| 112 } | 114 } |
| 113 | 115 |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 168 ) | 170 ) |
| 169 | 171 |
| 170 cron {'update_repo': | 172 cron {'update_repo': |
| 171 ensure => present, | 173 ensure => present, |
| 172 command => $update_webpage_cmd, | 174 command => $update_webpage_cmd, |
| 173 user => www, | 175 user => www, |
| 174 minute => '5-59/20', | 176 minute => '5-59/20', |
| 175 } | 177 } |
| 176 | 178 |
| 177 } | 179 } |
| LEFT | RIGHT |
« no previous file
|
no next file »
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
