Unified Diff: modules/web/manifests/server.pp
Issue 29526778:
#3073 - Support custom remote repository for web::server class (Closed)
Patch Set:
Created Aug. 24, 2017, 7:41 p.m.
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 »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: modules/web/manifests/server.pp |
| =================================================================== |
| --- a/modules/web/manifests/server.pp |
| +++ b/modules/web/manifests/server.pp |
| @@ -1,6 +1,7 @@ |
| class web::server( |
| $vhost, |
| $repository, |
| + $remote = "https://hg.adblockplus.org/${repository}", |
| $certificate = hiera('web::server::certificate', 'undef'), |
| $private_key = hiera('web::server::private_key', 'undef'), |
| $is_default = false, |
| @@ -112,7 +113,7 @@ |
| exec {"fetch_cms": |
| command => shellquote($fetch_cms_cmd), |
| - require => Package['mercurial'], |
| + require => Class['adblockplus::mercurial'], |
| timeout => 0, |
| creates => "/opt/cms/.hg/hgrc", |
| } |
| @@ -120,13 +121,13 @@ |
| $fetch_repo_cmd = [ |
| 'hg', 'clone', |
| '--noupdate', |
| - "https://hg.adblockplus.org/${repository}", |
| + $remote, |
| "/home/www/${repository}", |
| ] |
| exec {"fetch_repo": |
| command => shellquote($fetch_repo_cmd), |
| - require => Package['mercurial'], |
| + require => Class['adblockplus::mercurial'], |
| user => www, |
| timeout => 0, |
| creates => "/home/www/${repository}/.hg/hgrc", |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
