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

Unified Diff: modules/web/manifests/server.pp

Issue 29526640: #3044 - Introduce class adblockplus::mercurial (Closed)
Patch Set: Created Aug. 24, 2017, 4:02 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
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}",
mathias 2017/08/24 16:40:52 The changes in here are explanatory as well?
f.lopez 2017/08/24 17:45:58 Yes, this is both for testing purposes (if you wan
$certificate = hiera('web::server::certificate', 'undef'),
$private_key = hiera('web::server::private_key', 'undef'),
$is_default = false,
@@ -12,6 +13,7 @@
include sitescripts
include adblockplus::web
+ include adblockplus::mercurial
$pythonpath = 'PYTHONPATH=/opt/cms:/opt/sitescripts'
@@ -112,7 +114,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 +122,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",
« modules/adblockplus/manifests/mercurial/extension.pp ('K') | « modules/private-stub/hiera/base.yaml ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld