Skip to content

Commit 4118be9

Browse files
committed
Use Stdlib::Port where applicable
1 parent aab151b commit 4118be9

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

manifests/init.pp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@
582582
Optional[String] $package_provider = $puppet::params::package_provider,
583583
Optional[Variant[String,Hash,Array]] $package_install_options = $puppet::params::package_install_options,
584584
Optional[Variant[Stdlib::Absolutepath, Stdlib::HTTPUrl]] $package_source = $puppet::params::package_source,
585-
Integer[0, 65535] $port = $puppet::params::port,
585+
Stdlib::Port $port = $puppet::params::port,
586586
Boolean $splay = $puppet::params::splay,
587587
Variant[Integer[0],Pattern[/^\d+[smhdy]?$/]] $splaylimit = $puppet::params::splaylimit,
588588
Variant[Boolean, Stdlib::Absolutepath] $autosign = $puppet::params::autosign,
@@ -605,7 +605,7 @@
605605
Optional[Integer[0]] $http_connect_timeout = $puppet::params::http_connect_timeout,
606606
Optional[Integer[0]] $http_read_timeout = $puppet::params::http_read_timeout,
607607
Optional[Variant[String, Boolean]] $ca_server = $puppet::params::ca_server,
608-
Optional[Integer[0, 65535]] $ca_port = $puppet::params::ca_port,
608+
Optional[Stdlib::Port] $ca_port = $puppet::params::ca_port,
609609
Optional[String] $ca_crl_filepath = $puppet::params::ca_crl_filepath,
610610
Optional[String] $prerun_command = $puppet::params::prerun_command,
611611
Optional[String] $postrun_command = $puppet::params::postrun_command,
@@ -638,7 +638,7 @@
638638
String $server_group = $puppet::params::group,
639639
String $server_dir = $puppet::params::dir,
640640
String $server_ip = $puppet::params::ip,
641-
Integer $server_port = $puppet::params::port,
641+
Stdlib::Port $server_port = $puppet::params::port,
642642
Boolean $server_ca = $puppet::params::server_ca,
643643
Boolean $server_ca_crl_sync = $puppet::params::server_ca_crl_sync,
644644
Optional[Boolean] $server_crl_enable = $puppet::params::server_crl_enable,
@@ -647,7 +647,7 @@
647647
Array[String] $server_ca_client_whitelist = $puppet::params::server_ca_client_whitelist,
648648
Optional[Puppet::Custom_trusted_oid_mapping] $server_custom_trusted_oid_mapping = $puppet::params::server_custom_trusted_oid_mapping,
649649
Boolean $server_http = $puppet::params::server_http,
650-
Integer $server_http_port = $puppet::params::server_http_port,
650+
Stdlib::Port $server_http_port = $puppet::params::server_http_port,
651651
String $server_reports = $puppet::params::server_reports,
652652
Optional[Stdlib::Absolutepath] $server_puppetserver_dir = $puppet::params::server_puppetserver_dir,
653653
Optional[Stdlib::Absolutepath] $server_puppetserver_vardir = $puppet::params::server_puppetserver_vardir,

manifests/server.pp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@
351351
String $group = $puppet::server_group,
352352
String $dir = $puppet::server_dir,
353353
Stdlib::Absolutepath $codedir = $puppet::codedir,
354-
Integer $port = $puppet::server_port,
354+
Stdlib::Port $port = $puppet::server_port,
355355
String $ip = $puppet::server_ip,
356356
Boolean $ca = $puppet::server_ca,
357357
Optional[String] $ca_crl_filepath = $puppet::ca_crl_filepath,
@@ -362,7 +362,7 @@
362362
Array[String] $ca_client_whitelist = $puppet::server_ca_client_whitelist,
363363
Optional[Puppet::Custom_trusted_oid_mapping] $custom_trusted_oid_mapping = $puppet::server_custom_trusted_oid_mapping,
364364
Boolean $http = $puppet::server_http,
365-
Integer $http_port = $puppet::server_http_port,
365+
Stdlib::Port $http_port = $puppet::server_http_port,
366366
String $reports = $puppet::server_reports,
367367
Stdlib::Absolutepath $puppetserver_vardir = $puppet::server_puppetserver_vardir,
368368
Optional[Stdlib::Absolutepath] $puppetserver_rundir = $puppet::server_puppetserver_rundir,
@@ -437,7 +437,7 @@
437437
Boolean $metrics_jmx_enable = $puppet::server_metrics_jmx_enable,
438438
Boolean $metrics_graphite_enable = $puppet::server_metrics_graphite_enable,
439439
String $metrics_graphite_host = $puppet::server_metrics_graphite_host,
440-
Integer $metrics_graphite_port = $puppet::server_metrics_graphite_port,
440+
Stdlib::Port $metrics_graphite_port = $puppet::server_metrics_graphite_port,
441441
String $metrics_server_id = $puppet::server_metrics_server_id,
442442
Integer $metrics_graphite_interval = $puppet::server_metrics_graphite_interval,
443443
Variant[Undef, Array] $metrics_allowed = $puppet::server_metrics_allowed,

0 commit comments

Comments
 (0)