#10073 - Fix provisioning of downloadserver role

modules/downloadserver/manifests/init.pp

 class downloadserver(
     $domain,
     $certificate,
     $private_key,
     $is_default = false
   ) {
 
   include adblockplus::web
 
   class {'nginx':
@@ skipping 37 matching lines @@
 
   exec { "fetch_downloads":
     command => "hg clone https://hg.adblockplus.org/downloads /var/www/downloads",
     path => ["/usr/bin/", "/bin/"],
     user => hg,
     require => [
       Package['mercurial'],
       File['/var/www/downloads'],
     ],
     timeout => 0,
-    onlyif => "test ! -d /var/www/downloads/.hg"

[mathias, 2018/04/13 04:30:54]

This should be replaced by a `creates` attribute.

[f.lopez, 2018/04/13 21:13:20]

Acknowledged.

+    creates => "/var/www/downloads/.hg/hgrc"
   }
 
   File {
     owner => root,
     group => root,
     mode => '0644',
   }
 
   nginx::hostconfig{$domain:
     source => 'puppet:///modules/downloadserver/site.conf',
@@ skipping 10 matching lines @@
   }
 
   cron {'mirror':
     ensure => present,
     command => 'hg pull -q -u -R /var/www/downloads/',
     environment => hiera('cron::environment', []),
     user => hg,
     minute => '3-59/20'
   }
 
-  package { 'rsync':

[mathias, 2018/04/13 04:30:54]

Please use ensure_packages() when requiring a package that does not belong to
the current context exclusively.

[f.lopez, 2018/04/13 21:13:20]

Acknowledged.

-    ensure => present,
-  }
+  ensure_packages([
+    'rsync',
+  ])
 
   file {'/var/www/devbuilds':
     ensure => directory,
     owner => rsync
   }
 
   user {'rsync':
     ensure => present,
     home => '/home/rsync',
     managehome => true
@@ skipping 24 matching lines @@
     ensure => present,
     require => [
       File['/home/rsync/.ssh/id_rsa'],
       File['/var/www/devbuilds'],
       Package['rsync'],
     ],
     command => 'rsync -e ssh -ltprz --delete devbuilds@buildmaster.adblockplus.org:. /var/www/devbuilds',
     environment => hiera('cron::environment', []),
     user => rsync,
     hour => '*',
-    minute => '4-54/10',

[mathias, 2018/04/13 04:30:54]

This unrelated improvement is unrelated.

[f.lopez, 2018/04/13 21:13:20]

Acknowledged.

+    minute => '4-54/10'
   }
 }