Skip to content

Commit 60b171b

Browse files
JacobHennerJacobHenner
committed
Fixing mismatched datatypes
1 parent 9516c6c commit 60b171b

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

‎manifests/init.pp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@
4040
String $log_group = $::nginx::params::log_group,
4141
String $log_mode = '0750',
4242
Variant[String, Array[String]] $http_access_log = "${log_dir}/${::nginx::params::http_access_log_file}",
43-
Optional[Boolean] $http_format_log = undef,
43+
Optional[String] $http_format_log = undef,
4444
Variant[String, Array[String]] $nginx_error_log = "${log_dir}/${::nginx::params::nginx_error_log_file}",
4545
Nginx::ErrorLogSeverity $nginx_error_log_severity = 'error',
46-
String $pid = $::nginx::params::pid,
46+
Variant[String, Boolean] $pid = $::nginx::params::pid,
4747
String $proxy_temp_path = $::nginx::params::proxy_temp_path,
4848
String $root_group = $::nginx::params::root_group,
4949
String $run_dir = $::nginx::params::run_dir,
@@ -78,9 +78,9 @@
7878
Optional[String] $gzip_buffers = undef,
7979
Integer[1,9] $gzip_comp_level = 1,
8080
String $gzip_disable = 'msie6',
81-
Integer $gzip_min_length = 20,
82-
String $gzip_http_version = 1.1,
83-
Enum['on', 'off'] $gzip_proxied = 'off',
81+
String $gzip_min_length = '20',
82+
String $gzip_http_version = '1.1',
83+
String $gzip_proxied = 'off',
8484
Optional[Variant[Array[String], String]] $gzip_types = undef,
8585
Enum['on', 'off'] $gzip_vary = 'off',
8686
Optional[Variant[Hash, Array]] $http_cfg_prepend = undef,
@@ -97,7 +97,7 @@
9797
String $multi_accept = 'off',
9898
Integer $names_hash_bucket_size = 64,
9999
Integer $names_hash_max_size = 512,
100-
Boolean $nginx_cfg_prepend = false,
100+
Variant[Boolean, Hash, Tuple] $nginx_cfg_prepend = false,
101101
String $proxy_buffers = '32 4k',
102102
String $proxy_buffer_size = '8k',
103103
String $proxy_cache_inactive = '20m',
@@ -124,13 +124,13 @@
124124
Array[String] $proxy_hide_header = [],
125125
Array[String] $proxy_pass_header = [],
126126
Array[String] $proxy_ignore_header = [],
127-
Enum['on', 'off'] $sendfile = 'on',
127+
Variant[Boolean, Enum['on', 'off']] $sendfile = 'on',
128128
String $server_tokens = 'on',
129129
Enum['on', 'off'] $spdy = 'off',
130130
Enum['on', 'off'] $http2 = 'off',
131131
Enum['on', 'off'] $ssl_stapling = 'off',
132-
String $types_hash_bucket_size = '512',
133-
String $types_hash_max_size = '1024',
132+
Integer $types_hash_bucket_size = 512,
133+
Integer $types_hash_max_size = 1024,
134134
Integer $worker_connections = 1024,
135135
Enum['on', 'off'] $ssl_prefer_server_ciphers = 'on',
136136
Variant[Integer, Enum['auto']] $worker_processes = 1,
@@ -151,7 +151,7 @@
151151
### START Service Configuation ###
152152
Enum['running', 'absent', 'stopped', 'undef'] $service_ensure = running,
153153
Optional[String] $service_flags = undef,
154-
Optional[Boolean] $service_restart = undef,
154+
Optional[String] $service_restart = undef,
155155
String $service_name = 'nginx',
156156
Boolean $service_manage = true,
157157
### END Service Configuration ###

‎manifests/resource/server.pp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
Integer $ssl_port = 443,
166166
Enum['on', 'off'] $ssl_prefer_server_ciphers = $::nginx::ssl_prefer_server_ciphers,
167167
String $ssl_protocols = $::nginx::ssl_protocols,
168-
String $ssl_buffer_size = undef,
168+
Optional[String] $ssl_buffer_size = undef,
169169
String $ssl_ciphers = $::nginx::ssl_ciphers,
170170
String $ssl_cache = 'shared:SSL:10m',
171171
Optional[String] $ssl_crl = undef,
@@ -246,8 +246,8 @@
246246
Optional[String] $log_by_lua_file = undef,
247247
Boolean $use_default_location = true,
248248
Array[String] $rewrite_rules = [],
249-
Hash[String] $string_mappings = {},
250-
Hash[String] $geo_mappings = {},
249+
Hash[String, String] $string_mappings = {},
250+
Hash[String, String] $geo_mappings = {},
251251
Optional[String] $gzip_types = undef,
252252
String $owner = $::nginx::global_owner,
253253
String $group = $::nginx::global_group,

‎manifests/resource/streamhost.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
Variant[Array, String] $ipv6_listen_ip = '::',
5656
Integer $ipv6_listen_port = 80,
5757
String $ipv6_listen_options = 'default ipv6only=on',
58-
String $proxy = undef,
58+
Optional[String] $proxy = undef,
5959
String $proxy_read_timeout = $::nginx::proxy_read_timeout,
6060
String $proxy_connect_timeout = $::nginx::proxy_connect_timeout,
6161
Array $resolver = [],

‎manifests/service.pp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
#
1515
# This class file is not called directly
1616
class nginx::service(
17-
Optional[Boolean] $service_restart = $::nginx::service_restart,
18-
Enum['running', 'absent', 'stopped', 'undef'] $service_ensure = $::nginx::service_ensure,
19-
String $service_name = $::nginx::service_name,
20-
Optional[String] $service_flags = $::nginx::service_flags,
21-
Boolean $service_manage = $::nginx::service_manage,
17+
Optional[String] $service_restart = $::nginx::service_restart,
18+
Enum['running', 'absent', 'stopped', 'undef'] $service_ensure = $::nginx::service_ensure,
19+
String $service_name = $::nginx::service_name,
20+
Optional[String] $service_flags = $::nginx::service_flags,
21+
Boolean $service_manage = $::nginx::service_manage,
2222
) {
2323

2424
assert_private()

0 commit comments

Comments
 (0)