(syntax) parameter_types part 6

puppetlabs · May 27, 2022 · d2780c3 · d2780c3
1 parent 6195606
commit d2780c3
Show file tree

Hide file tree

Showing 9 changed files with 270 additions and 270 deletions.
diff --git a/manifests/mpm.pp b/manifests/mpm.pp
@@ -2,8 +2,8 @@
 #
 # @api private
 define apache::mpm (
-  $lib_path       = $apache::lib_path,
-  $apache_version = $apache::apache_version,
+  String $lib_path                  = $apache::lib_path,
+  Optional[String] $apache_version  = $apache::apache_version,
 ) {
   if ! defined(Class['apache']) {
     fail('You must include the apache base class before using any apache defined resources')

diff --git a/manifests/package.pp b/manifests/package.pp
@@ -3,8 +3,8 @@
 #
 # @api private
 class apache::package (
-  $ensure     = 'present',
-  $mpm_module = $apache::params::mpm_module,
+  String $ensure     = 'present',
+  String $mpm_module = $apache::params::mpm_module,
 ) inherits apache::params {
   # The base class must be included first because it is used by parameter defaults
   if ! defined(Class['apache']) {

diff --git a/manifests/peruser/multiplexer.pp b/manifests/peruser/multiplexer.pp
@@ -5,9 +5,9 @@
 #
 # @api private
 define apache::peruser::multiplexer (
-  $user = $apache::user,
-  $group = $apache::group,
-  $file = undef,
+  String $user            = $apache::user,
+  String $group           = $apache::group,
+  Optional[String] $file  = undef,
 ) {
   if ! $file {
     $filename = "${name}.conf"

diff --git a/manifests/peruser/processor.pp b/manifests/peruser/processor.pp
@@ -3,9 +3,9 @@
 #
 # @api private
 define apache::peruser::processor (
-  $user,
-  $group,
-  $file = undef,
+  String $user,
+  String $group,
+  Optional[String] $file = undef,
 ) {
   if ! $file {
     $filename = "${name}.conf"

diff --git a/manifests/service.pp b/manifests/service.pp
@@ -3,11 +3,11 @@
 #
 # @api private
 class apache::service (
-  $service_name           = $apache::params::service_name,
-  Boolean $service_enable = true,
-  $service_ensure         = 'running',
-  Boolean $service_manage = true,
-  $service_restart        = undef
+  String $service_name                    = $apache::params::service_name,
+  Boolean $service_enable                 = true,
+  Variant[Boolean,String] $service_ensure = 'running',
+  Boolean $service_manage                 = true,
+  Optional[String] $service_restart       = undef
 ) {
   # The base class must be included first because parameter defaults depend on it
   if ! defined(Class['apache::params']) {

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
diff --git a/manifests/vhost/custom.pp b/manifests/vhost/custom.pp
@@ -16,10 +16,10 @@
 #   Specifies whether to validate the configuration file before notifying the Apache service.
 #
 define apache::vhost::custom (
-  $content,
-  $ensure = 'present',
-  $priority = '25',
-  $verify_config = true,
+  String $content,
+  String $ensure                    = 'present',
+  Variant[Integer,String] $priority = '25',
+  Boolean $verify_config            = true,
 ) {
   include apache
 

diff --git a/manifests/vhost/fragment.pp b/manifests/vhost/fragment.pp
@@ -58,10 +58,10 @@
 #
 define apache::vhost::fragment (
   String[1] $vhost,
-  Optional[Integer[0]] $port = undef,
-  $priority = undef,
-  Optional[String] $content = undef,
-  Integer[0] $order = 900,
+  Optional[Integer[0]] $port                  = undef,
+  Optional[Variant[Integer,String]] $priority = undef,
+  Optional[String] $content                   = undef,
+  Integer[0] $order                           = 900,
 ) {
   # This copies the logic from apache::vhost
   if $priority {

diff --git a/manifests/vhosts.pp b/manifests/vhosts.pp
@@ -19,7 +19,7 @@
 #   `apache::vhost` defined type's parameters.
 #
 class apache::vhosts (
-  $vhosts = {},
+  Hash $vhosts = {},
 ) {
   include apache
   create_resources('apache::vhost', $vhosts)