Skip to content

Commit cfed312

Browse files
JacobHennerJacobHenner
committed
Fixing typing issues and existing spec tests in response to spec failures
1 parent 286d32e commit cfed312

14 files changed

+127
-125
lines changed

‎manifests/init.pp

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,32 +26,32 @@
2626
# }
2727
class nginx (
2828
### START Nginx Configuration ###
29-
Stdlib::Unixpath $client_body_temp_path = $::nginx::params::client_body_temp_path,
29+
String[1] $client_body_temp_path = $::nginx::params::client_body_temp_path,
3030
Boolean $confd_only = false,
3131
Boolean $confd_purge = false,
32-
Stdlib::Unixpath $conf_dir = $::nginx::params::conf_dir,
32+
String[1] $conf_dir = $::nginx::params::conf_dir,
3333
Optional[Nginx::Toggle] $daemon = undef,
3434
String[1] $daemon_user = $::nginx::params::daemon_user,
3535
Optional[String[1]] $daemon_group = undef,
3636
String[1] $global_owner = $::nginx::params::global_owner,
3737
String[1] $global_group = $::nginx::params::global_group,
3838
Stdlib::Filemode $global_mode = $::nginx::params::global_mode,
39-
Stdlib::Unixpath $log_dir = $::nginx::params::log_dir,
39+
String[1] $log_dir = $::nginx::params::log_dir,
4040
String[1] $log_group = $::nginx::params::log_group,
4141
Stdlib::Filemode $log_mode = '0750',
42-
Variant[Stdlib::Unixpath, Array[Stdlib::Unixpath]] $http_access_log = "${log_dir}/${::nginx::params::http_access_log_file}",
42+
Variant[String[1], Array[String[1]]] $http_access_log = "${log_dir}/${::nginx::params::http_access_log_file}",
4343
Optional[String[1]] $http_format_log = undef,
44-
Variant[Stdlib::Unixpath, Array[Stdlib::Unixpath]] $nginx_error_log = "${log_dir}/${::nginx::params::nginx_error_log_file}",
44+
Variant[String[1], Array[String[1]]] $nginx_error_log = "${log_dir}/${::nginx::params::nginx_error_log_file}",
4545
Nginx::ErrorLogSeverity $nginx_error_log_severity = 'error',
46-
Optional[Stdlib::Unixpath] $pid = $::nginx::params::pid,
47-
Stdlib::Unixpath $proxy_temp_path = $::nginx::params::proxy_temp_path,
46+
Variant[String[1], Boolean] $pid = $::nginx::params::pid,
47+
String[1] $proxy_temp_path = $::nginx::params::proxy_temp_path,
4848
String[1] $root_group = $::nginx::params::root_group,
49-
Stdlib::Unixpath $run_dir = $::nginx::params::run_dir,
49+
String[1] $run_dir = $::nginx::params::run_dir,
5050
String[1] $sites_available_owner = $::nginx::params::sites_available_owner,
5151
String[1] $sites_available_group = $::nginx::params::sites_available_group,
5252
Stdlib::Filemode $sites_available_mode = $::nginx::params::sites_available_mode,
5353
Boolean $super_user = $::nginx::params::super_user,
54-
Stdlib::Unixpath $temp_dir = $::nginx::params::temp_dir,
54+
String[1] $temp_dir = $::nginx::params::temp_dir,
5555
Boolean $server_purge = false,
5656

5757
# Primary Templates
@@ -72,7 +72,7 @@
7272
String[1] $fastcgi_cache_keys_zone = 'd3:100m',
7373
String[1] $fastcgi_cache_levels = '1',
7474
String[1] $fastcgi_cache_max_size = '500m',
75-
Optional[Stdlib::Unixpath] $fastcgi_cache_path = undef,
75+
Optional[String[1]] $fastcgi_cache_path = undef,
7676
Optional[String[1]] $fastcgi_cache_use_stale = undef,
7777
Nginx::Toggle $gzip = 'on',
7878
Optional[String[1]] $gzip_buffers = undef,
@@ -83,12 +83,12 @@
8383
String[1] $gzip_proxied = 'off',
8484
Optional[Variant[Array[String[1]], String[1]]] $gzip_types = undef,
8585
Nginx::Toggle $gzip_vary = 'off',
86-
Optional[Variant[Hash[String[1],String], Array[String[1]]]] $http_cfg_prepend = undef,
87-
Optional[Variant[Hash[String[1],String], Array[String[1]]]] $http_cfg_append = undef,
86+
Optional[Nginx::Directives] $http_cfg_prepend = undef,
87+
Optional[Nginx::Directives] $http_cfg_append = undef,
8888
Optional[Variant[Array[String[1]], String[1]]] $http_raw_prepend = undef,
8989
Optional[Variant[Array[String[1]], String[1]]] $http_raw_append = undef,
9090
Nginx::Toggle $http_tcp_nodelay = 'on',
91-
Nginx::Toggle $http_tcp_nopush = 'off',
91+
Optional[Nginx::Toggle] $http_tcp_nopush = undef,
9292
Nginx::Duration $keepalive_timeout = '65s',
9393
String[1] $keepalive_requests = '100',
9494
Hash[String[1],String] $log_format = {},
@@ -97,7 +97,7 @@
9797
Nginx::Toggle $multi_accept = 'off',
9898
Integer $names_hash_bucket_size = 64,
9999
Integer $names_hash_max_size = 512,
100-
Optional[Variant[Hash[String[1],String], Tuple[String]]] $nginx_cfg_prepend = undef,
100+
Optional[Nginx::Directives] $nginx_cfg_prepend = undef,
101101
String[1] $proxy_buffers = '32 4k',
102102
String[1] $proxy_buffer_size = '8k',
103103
Nginx::Duration $proxy_cache_inactive = '20m',
@@ -124,7 +124,7 @@
124124
Array[String[1]] $proxy_hide_header = [],
125125
Array[String[1]] $proxy_pass_header = [],
126126
Array[String[1]] $proxy_ignore_header = [],
127-
Nginx::Toggle $sendfile = 'on',
127+
Optional[Nginx::Toggle] $sendfile = undef,
128128
String[1] $server_tokens = 'on',
129129
Boolean $spdy = false,
130130
Boolean $http2 = false,
@@ -137,7 +137,7 @@
137137
Integer $worker_rlimit_nofile = 1024,
138138
String[1] $ssl_protocols = 'TLSv1 TLSv1.1 TLSv1.2',
139139
String[1] $ssl_ciphers = 'ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS', # lint:ignore:140chars
140-
Optional[Stdlib::Unixpath] $ssl_dhparam = undef,
140+
Optional[String[1]] $ssl_dhparam = undef,
141141

142142
### START Package Configuration ###
143143
String[1] $package_ensure = present,

‎manifests/params.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
case $facts['os']['family'] {
2121
'ArchLinux': {
2222
$_module_os_overrides = {
23-
'pid' => undef,
23+
'pid' => false,
2424
'daemon_user' => 'http',
2525
'log_group' => 'log',
2626
'package_name' => 'nginx-mainline',

‎manifests/resource/location.pp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
Boolean $internal = false,
165165
String $location = $name,
166166
String $server = undef,
167-
Optional[Stdlib::Unixpath] $www_root = undef,
167+
Optional[String[1]] $www_root = undef,
168168
Optional[Nginx::Toggle] $autoindex = undef,
169169
Array[String[1]] $index_files = [
170170
'index.html',
@@ -183,27 +183,27 @@
183183
Optional[String] $fastcgi = undef,
184184
Optional[String[1]] $fastcgi_index = undef,
185185
Optional[Hash[String[1],String[1]]] $fastcgi_param = undef,
186-
Stdlib::Unixpath $fastcgi_params = "${::nginx::conf_dir}/fastcgi.conf",
187-
Optional[Stdlib::Unixpath] $fastcgi_script = undef,
186+
String[1] $fastcgi_params = "${::nginx::conf_dir}/fastcgi.conf",
187+
Optional[String[1]] $fastcgi_script = undef,
188188
Optional[String[1]] $fastcgi_split_path = undef,
189189
Optional[String] $uwsgi = undef,
190190
Optional[Hash[String[1],String]] $uwsgi_param = undef,
191-
Stdlib::Unixpath $uwsgi_params = "${nginx::config::conf_dir}/uwsgi_params",
191+
String[1] $uwsgi_params = "${nginx::config::conf_dir}/uwsgi_params",
192192
Optional[Nginx::Duration] $uwsgi_read_timeout = undef,
193193
Boolean $ssl = false,
194194
Boolean $ssl_only = false,
195-
Optional[Stdlib::Unixpath] $location_alias = undef,
195+
Optional[String[1]] $location_alias = undef,
196196
Optional[Enum['any', 'all']] $location_satisfy = undef,
197197
Optional[Array[String]] $location_allow = undef,
198198
Optional[Array[String]] $location_deny = undef,
199199
Boolean $stub_status = false,
200200
Optional[Variant[String, Array[String]]] $raw_prepend = undef,
201201
Optional[Variant[String, Array[String]]] $raw_append = undef,
202-
Optional[Hash[String, String]] $location_custom_cfg = undef,
203-
Optional[Hash[String, String]] $location_cfg_prepend = undef,
204-
Optional[Hash[String, String]] $location_cfg_append = undef,
205-
Optional[Hash[String, String]] $location_custom_cfg_prepend = undef,
206-
Optional[Hash[String, String]] $location_custom_cfg_append = undef,
202+
Optional[Nginx::Directives] $location_custom_cfg = undef,
203+
Optional[Nginx::Directives] $location_cfg_prepend = undef,
204+
Optional[Nginx::Directives] $location_cfg_append = undef,
205+
Optional[Nginx::Directives] $location_custom_cfg_prepend = undef,
206+
Optional[Nginx::Directives] $location_custom_cfg_append = undef,
207207
Optional[Array[String]] $include = undef,
208208
Optional[Array[String]] $try_files = undef,
209209
Optional[String] $proxy_cache = undef,

‎manifests/resource/mailhost.pp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,22 +86,22 @@
8686
Stdlib::Port $ipv6_listen_port = 80,
8787
String $ipv6_listen_options = 'default ipv6only=on',
8888
Boolean $ssl = false,
89-
Optional[Stdlib::Unixpath] $ssl_cert = undef,
89+
Optional[String[1]] $ssl_cert = undef,
9090
String $ssl_ciphers = $::nginx::ssl_ciphers,
91-
Optional[Stdlib::Unixpath] $ssl_client_cert = undef,
92-
Optional[Stdlib::Unixpath] $ssl_crl = undef,
93-
Optional[Stdlib::Unixpath] $ssl_dhparam = $::nginx::ssl_dhparam,
91+
Optional[String[1]] $ssl_client_cert = undef,
92+
Optional[String[1]] $ssl_crl = undef,
93+
Optional[String[1]] $ssl_dhparam = $::nginx::ssl_dhparam,
9494
Optional[String[1]] $ssl_ecdh_curve = undef,
95-
Optional[Stdlib::Unixpath] $ssl_key = undef,
96-
Optional[Stdlib::Unixpath] $ssl_password_file = undef,
95+
Optional[String[1]] $ssl_key = undef,
96+
Optional[String[1]] $ssl_password_file = undef,
9797
Optional[Stdlib::Port] $ssl_port = undef,
9898
Nginx::Toggle $ssl_prefer_server_ciphers = $::nginx::ssl_prefer_server_ciphers,
9999
String $ssl_protocols = $::nginx::ssl_protocols,
100100
Optional[String[1]] $ssl_session_cache = undef,
101-
Optional[Stdlib::Unixpath] $ssl_session_ticket_key = undef,
101+
Optional[String[1]] $ssl_session_ticket_key = undef,
102102
Optional[Nginx::Toggle] $ssl_session_tickets = undef,
103103
Nginx::Duration $ssl_session_timeout = '5m',
104-
Optional[Stdlib::Unixpath] $ssl_trusted_cert = undef,
104+
Optional[String[1]] $ssl_trusted_cert = undef,
105105
Optional[Integer] $ssl_verify_depth = undef,
106106
Enum['on', 'off', 'only'] $starttls = 'off',
107107
Optional[Enum['imap', 'pop3', 'smtp']] $protocol = undef,
@@ -117,8 +117,8 @@
117117
Optional[Array[String[1]]] $smtp_capabilities = undef,
118118
Optional[Variant[Array[String[1]], String[1]]] $raw_prepend = undef,
119119
Optional[Variant[Array[String[1]], String[1]]] $raw_append = undef,
120-
Optional[Hash[String[1],String]] $mailhost_cfg_prepend = undef,
121-
Optional[Hash[String[1],String]] $mailhost_cfg_append = undef,
120+
Optional[Nginx::Directives] $mailhost_cfg_prepend = undef,
121+
Optional[Nginx::Directives] $mailhost_cfg_append = undef,
122122
Nginx::Toggle $proxy_pass_error_message = 'off',
123123
Array[Stdlib::Host] $server_name = [$name]
124124
) {

‎manifests/resource/map.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@
7373

7474
define nginx::resource::map (
7575
String[2] $string,
76-
Variant[Array[String[1]], Hash[String[1], String[1]]] $mappings,
76+
Variant[Array[Hash[String[1],String]], Hash[String[1],String]] $mappings,
7777
Optional[String[1]] $default = undef,
7878
Enum['absent', 'present'] $ensure = 'present',
79-
Array[Stdlib::Unixpath] $include_files = [],
79+
Array[String[1]] $include_files = [],
8080
Boolean $hostnames = false
8181
) {
8282
if ! defined(Class['nginx']) {

0 commit comments

Comments
 (0)