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

Side by Side Diff: modules/web/manifests/server.pp

Issue 29438574: Noissue - Improve CMS repository clone command (Closed)
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.
Jump to:
View unified diff | Download patch
« 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') | Show Comments Hide Comments ('s')
OLDNEW
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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 } 92 }
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 = [
103 'hg', 'clone',
104 'https://hg.adblockplus.org/cms/',
105 '/opt/cms',
106 ]
107
102 exec {"fetch_cms": 108 exec {"fetch_cms":
103 command => "hg clone https://hg.adblockplus.org/cms/ /opt/cms", 109 command => shellquote($fetch_cms_cmd),
104 path => ["/usr/bin/", "/bin/"], 110 path => ["/usr/bin/", "/bin/"],
105 require => Package['mercurial'], 111 require => Package['mercurial'],
106 timeout => 0, 112 timeout => 0,
107 creates => "/opt/cms/.hg/hgrc", 113 creates => "/opt/cms/.hg/hgrc",
108 } 114 }
109 115
110 exec {"fetch_repo": 116 exec {"fetch_repo":
111 command => "hg clone -U https://hg.adblockplus.org/${repository} /home/www/$ {repository}", 117 command => "hg clone -U https://hg.adblockplus.org/${repository} /home/www/$ {repository}",
112 path => ["/usr/bin/", "/bin/"], 118 path => ["/usr/bin/", "/bin/"],
113 require => Package['mercurial'], 119 require => Package['mercurial'],
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 ) 170 )
165 171
166 cron {'update_repo': 172 cron {'update_repo':
167 ensure => present, 173 ensure => present,
168 command => $update_webpage_cmd, 174 command => $update_webpage_cmd,
169 user => www, 175 user => www,
170 minute => '5-59/20', 176 minute => '5-59/20',
171 } 177 }
172 178
173 } 179 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld