Side by Side Diff: modules/web/manifests/server.pp
Issue 29438571:
Noissue - Improve web repository clone command (Closed)
Patch Set: For comment 2
Created May 16, 2017, 7:26 p.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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 100 } | 100 } |
| 101 | 101 |
| 102 exec {"fetch_cms": | 102 exec {"fetch_cms": |
| 103 command => "hg clone https://hg.adblockplus.org/cms/ /opt/cms", | 103 command => "hg clone https://hg.adblockplus.org/cms/ /opt/cms", |
| 104 path => ["/usr/bin/", "/bin/"], | 104 path => ["/usr/bin/", "/bin/"], |
| 105 require => Package['mercurial'], | 105 require => Package['mercurial'], |
| 106 timeout => 0, | 106 timeout => 0, |
| 107 creates => "/opt/cms/.hg/hgrc", | 107 creates => "/opt/cms/.hg/hgrc", |
| 108 } | 108 } |
| 109 | 109 |
| 110 $fetch_repo_cmd = [ | |
| 111 'hg', 'clone', | |
| 112 '--noupdate', | |
| 113 "https://hg.adblockplus.org/${repository}", | |
| 114 "/home/www/${repository}", | |
| 115 ] | |
| 116 | |
| 110 exec {"fetch_repo": | 117 exec {"fetch_repo": |
| 111 command => "hg clone -U https://hg.adblockplus.org/${repository} /home/www/$ {repository}", | 118 command => shellquote($fetch_repo_cmd), |
| 112 path => ["/usr/bin/", "/bin/"], | 119 path => ["/usr/bin/", "/bin/"], |
| 113 require => Package['mercurial'], | 120 require => Package['mercurial'], |
| 114 user => www, | 121 user => www, |
| 115 timeout => 0, | 122 timeout => 0, |
| 116 creates => "/home/www/${repository}/.hg/hgrc", | 123 creates => "/home/www/${repository}/.hg/hgrc", |
| 117 } | 124 } |
| 118 | 125 |
| 119 $initialize_content_exec = [ | 126 $initialize_content_exec = [ |
| 120 'python', '-m', 'cms.bin.generate_static_pages', | 127 'python', '-m', 'cms.bin.generate_static_pages', |
| 121 "/home/www/${repository}", "/var/www/${vhost}", | 128 "/home/www/${repository}", "/var/www/${vhost}", |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 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 } |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
