--- a/modules/website/manifests/https/multitld.pp	Sun Jan 26 12:06:43 2020 +0000
+++ b/modules/website/manifests/https/multitld.pp	Sun Jan 26 12:08:03 2020 +0000
@@ -1,29 +1,27 @@
 define website::https::multitld (
-  $docroot         = undef,
-  $ip              = $website::primary_ip,
-  $priority        = undef,
-  $base            = $name,
-  $main_tld        = $website::tld,
-  $extra_tlds      = $website::extra_tlds,
-  $ssl_ca_chain    = undef,
-  $letsencrypt_name = undef,
-  $docroot_owner   = undef,
-  $docroot_group   = undef,
-  $custom_fragment = undef,
-  $force_no_index  = undef,
-  $force_no_www    = undef,
-  $csp             = true,
-  $csp_override    = undef,
-  $csp_report      = true,
-  $csp_report_override = undef,
+  Optional[String] $docroot = undef,
+  String $ip              = $website::primary_ip,
+  Optional[Integer] $priority       = undef,
+  String $base            = $name,
+  Pattern[/^[a-z]+(\.[a-z]+)?$/] $main_tld = $website::tld,
+  Array $extra_tlds = $website::extra_tlds,
+  Optional[String] $ssl_ca_chain    = undef,
+  Optional[String] $letsencrypt_name = undef,
+  Optional[String] $docroot_owner   = undef,
+  Optional[String] $docroot_group   = undef,
+  Optional[String] $custom_fragment = undef,
+  Optional[Boolean] $force_no_index = undef,
+  Optional[Boolean] $force_no_www   = undef,
+  Optional[Boolean] $csp            = true,
+  Optional[Hash[String, String]] $csp_override     = undef,
+  Boolean $csp_report     = true,
+  Optional[Hash[String, String]] $csp_report_override = undef,
   ) {
 
   if ! defined(Class['website']) {
     fail('You must include the website base class before using any website defined resources')
   }
 
-  validate_array($extra_tlds)
-  validate_re($main_tld, '^[a-z]+(\.[a-z]+)?', 'TLD must be in the form "com" or "co.uk"')
   $alias = domain_to_short_domain($base)
 
   $base_aliases = prefix($extra_tlds, "${base}.")