Issue 2836 - Fix regressions from #2814 / #2835

modules/filtermaster/manifests/init.pp

-class filtermaster {
+class filtermaster(
+  $repos = hiera('filtermaster::repos', []),
+  $repo_downloads = hiera('filtermaster::repo_downloads', {}),
+) {
 
   Cron {
     environment => ['MAILTO=admins@adblockplus.org', 'PYTHONPATH=/opt/sitescripts'],
   }
 
   include ssh
 
   concat::fragment {'sshd_max_limits':
     target => 'sshd_config',
     order => '50',
@@ skipping 79 matching lines @@
     exec {"fetch_${title}":
       command => "hg clone https://hg.adblockplus.org/${title} /home/rsync/subscription/${title}",
       path => ["/usr/bin/", "/bin/"],
       require => Package['mercurial'],
       user => rsync,
       timeout => 0,
       onlyif => "test ! -d /home/rsync/subscription/${title}"
     }
   }
 
-  create_resources('filtermaster::repo_download', $repo_download)
+  create_resources('filtermaster::repo_download', $repo_downloads)
+
+  repo_download {$repos:
+  }
 
   cron {'update_subscription':
     ensure => present,
     command => "python -m sitescripts.subscriptions.bin.updateSubscriptionDownloads 3>&1 1>/dev/null 2>&3 | perl -pe 's/^/\"[\" . scalar localtime() . \"] \"/e' >> /tmp/subscription_errors && chmod 666 /tmp/subscription_errors 2>/dev/null",
     user => rsync,
     require => User['rsync'],
     minute => '*/10'
   }
 
   cron {'update_malware':
@@ skipping 13 matching lines @@
       User['rsync'],
       File['/home/rsync/update_repos.sh']
     ],
     minute  => '8-58/10'
   }
 
   class {'sitescripts':
     sitescriptsini_content => template('filtermaster/sitescripts.ini.erb'),
   }
 }