#1980 - Introduce puppet class adblockplus_web in downloadserver module

modules/downloadserver/manifests/init.pp

 class downloadserver(
     $domain,
     $certificate,
     $private_key,
     $is_default = false
   ) {
+
+  include adblockplus::web
 
   class {'nginx':
     worker_connections => 4000,
     ssl_session_cache => off,
   }
 
   class {'sitescripts':
     sitescriptsini_source => 'puppet:///modules/downloadserver/sitescripts',
   }
 
@@ skipping 11 matching lines @@
       Class['sitescripts'],
       Package['python-jinja2'],
     ],
   }
 
   user {'hg':
     ensure => present,
     comment => 'Mercurial client user',
     home => '/home/hg',
     managehome => true
-  }
-
-  class {'adblockplus::web':

[mathias, 2017/07/06 14:14:36]

Now I get your question from earlier today. I am sorry, you where right: this
should be an include and the parameters should be fed from Hiera.

-    directory => {
-      owner => 'hg',
-      mode => '0644',
-    }
   }
 
   exec { "fetch_downloads":
     command => "hg clone https://hg.adblockplus.org/downloads /var/www/downloads",
     path => ["/usr/bin/", "/bin/"],
     require => Package['mercurial'],
     user => hg,
     timeout => 0,
     onlyif => "test ! -d /var/www/downloads"
   }
@@ skipping 62 matching lines @@
     ensure => present,
     require => [File['/home/rsync/.ssh/id_rsa'],
                 File['/var/www/devbuilds']],
     command => 'rsync -e ssh -ltprz --delete devbuilds@server16.adblockplus.org:. /var/www/devbuilds',
     environment => hiera('cron::environment', []),
     user => rsync,
     hour => '*',
     minute => '4-54/10'
   }
 }