Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: modules/web/manifests/server.pp

Issue 29438571: Noissue - Improve web repository clone command (Closed)
Left Patch Set: Created May 16, 2017, 1:01 a.m.
Right 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.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« 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') | Show Comments Hide Comments ('s')
LEFTRIGHT
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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 = [ 110 $fetch_repo_cmd = [
111 "hg", "clone", "-U", "https://hg.adblockplus.org/${repository}", 111 'hg', 'clone',
mathias 2017/05/16 09:02:07 Please use single quotes.
112 '--noupdate',
113 "https://hg.adblockplus.org/${repository}",
112 "/home/www/${repository}", 114 "/home/www/${repository}",
113 ] 115 ]
114 116
115 exec {"fetch_repo": 117 exec {"fetch_repo":
116 command => shellquote($fetch_repo_cmd), 118 command => shellquote($fetch_repo_cmd),
117 path => ["/usr/bin/", "/bin/"], 119 path => ["/usr/bin/", "/bin/"],
118 require => Package['mercurial'], 120 require => Package['mercurial'],
119 user => www, 121 user => www,
120 timeout => 0, 122 timeout => 0,
121 creates => "/home/www/${repository}/.hg/hgrc", 123 creates => "/home/www/${repository}/.hg/hgrc",
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 ) 171 )
170 172
171 cron {'update_repo': 173 cron {'update_repo':
172 ensure => present, 174 ensure => present,
173 command => $update_webpage_cmd, 175 command => $update_webpage_cmd,
174 user => www, 176 user => www,
175 minute => '5-59/20', 177 minute => '5-59/20',
176 } 178 }
177 179
178 } 180 }
LEFTRIGHT
« no previous file | no next file » | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld