#3197 - Use of hash for parameters in legacy website

modules/adblockplus/manifests/legacy/webserver.pp

 # == Class: adblockplus::legacy::webserver
 #
 # A container for migrating obsolete resources in web2, formerly located
 # in manifests/webserver.pp.
 #
 # See http://hub.eyeo.com/issues/2007 for more information.
 #
-class adblockplus::legacy::webserver {
+class adblockplus::legacy::webserver (
+  $website = {},
+) {
 
-  class {'web::server':
-    vhost => 'adblockplus.org',
-    certificate => 'adblockplus.org_sslcert.pem',
-    private_key => 'adblockplus.org_sslcert.key',
-    is_default => true,
-    aliases => ['www.adblockplus.org'],
+  ensure_resource('class', 'web::server', merge({

[mathias, 2017/08/30 17:41:37]

This is now a new mechanism on top of Puppet's in-code declarations and Hiera's
*individual* parameter lookup - a *combined* parameter lookup that will silently
overwrite any individual ones. I don't like it. 

Discarding the $website hash and the merge, e.g. only providing the
`custom_config` and relying on Hiera's parameter lookup (i.e.
`web::server::vhost`) should be a better approach. 

     custom_config => template("web/adblockplus.org.conf.erb"),
-    repository => 'web.adblockplus.org',
-    multiplexer_locations => ['/getSubscription'],
-    geoip => true,
-  }
+  }, $website))
 
   nginx::module{'geoip':
     path => 'modules/ngx_http_geoip_module.so',
   }
 
   ensure_packages([
     'make',
     'doxygen',
   ])
 
@@ skipping 43 matching lines @@
       Class['sitescripts'],
       Class['web::server'],
       Class['nodejs'],
     ],
     command => shellquote($generate_docs_cmd),
     user => www,
     minute => '5-55/10',
   }
 }