diff --git a/manifests/init.pp b/manifests/init.pp index 48d5508..118d509 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -76,12 +76,12 @@ $allowed_hosts = $nsclient::params::allowed_hosts, $service_state = $nsclient::params::service_state, $service_enable = $nsclient::params::service_enable, - $package_source_location = $nsclient::params::package_source_location, - $package_source = $nsclient::params::package_source, - $package_name = $nsclient::params::package_name, + String $package_source_location = $nsclient::params::package_source_location, + String $package_source = $nsclient::params::package_source, + String $package_name = $nsclient::params::package_name, $download_destination = $nsclient::params::download_destination, - $config_template = $nsclient::params::config_template, - $install_path = $nsclient::params::install_path, + String $config_template = $nsclient::params::config_template, + String $install_path = $nsclient::params::install_path, Optional[String[1]] $password = $nsclient::params::password, Optional[String[1]] $proxy_url = $nsclient::params::proxy_url, Boolean $chocolatey_provider = $nsclient::params::chocolatey_provider, @@ -89,12 +89,6 @@ Optional[String[1]] $chocolatey_package_version = $nsclient::params::chocolatey_package_version ) inherits nsclient::params { - validate_string($package_source_location) - validate_string($package_source) - validate_string($package_name) - validate_string($config_template) - validate_string($install_path) - class {'::nsclient::install':} -> class {'::nsclient::service':} diff --git a/manifests/install.pp b/manifests/install.pp index ae4ab60..965d3f3 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -9,10 +9,7 @@ # class nsclient::install { - validate_string($nsclient::package_source_location) - validate_string($nsclient::package_source) - validate_string($nsclient::package_name) - validate_string($nsclient::install_path) + assert_private("You're not supposed to do that!") $source = "${nsclient::package_source_location}/${nsclient::package_source}"