#3044 - Introduce class adblockplus::mercurial

modules/web/manifests/server.pp

 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 want to test it works) and how it
would look like the integration, this particular file will be uploaded for
another codereview as well, although we can use it here to see the full picture.

     $certificate = hiera('web::server::certificate', 'undef'),
     $private_key = hiera('web::server::private_key', 'undef'),
     $is_default = false,
     $aliases = undef,
     $custom_config = undef,
     $multiplexer_locations = undef,
     $geoip = false,
 ) {
 
   include sitescripts
   include adblockplus::web
+  include adblockplus::mercurial
 
   $pythonpath = 'PYTHONPATH=/opt/cms:/opt/sitescripts'
 
   # Ensure there is at least one character in the respective strings;
   # see https://codereview.adblockplus.org/29329028/#msg3
   validate_re($vhost, '.+')
   validate_re($repository, '.+')
 
   File {
     owner  => 'root',
@@ skipping 80 matching lines @@
     'https://hg.adblockplus.org/cms/',
     '/opt/cms',
   ]
 
   Exec {
     path => ["/usr/bin/", "/bin/"],
   }
 
   exec {"fetch_cms":
     command => shellquote($fetch_cms_cmd),
-    require => Package['mercurial'],
+    require => Class['adblockplus::mercurial'],
     timeout => 0,
     creates => "/opt/cms/.hg/hgrc",
   }
 
   $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",
   }
 
   $initialize_content_exec = [
     'python', '-m', 'cms.bin.generate_static_pages',
     "/home/www/${repository}", "/var/www/${vhost}",
   ]
 
@@ skipping 43 matching lines @@
   )
 
   cron {'update_repo':
     ensure => present,
     command => $update_webpage_cmd,
     user => www,
     minute  => '5-59/20',
   }
 
 }