#3044 - Introduce class adblockplus::mercurial

modules/web/manifests/server.pp

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,
@@ -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",