Skip to content

Commit aa2df02

Browse files
JacobHennerekohl
JacobHenner
authored and
ekohl
committed
Add explicit parameter types to all parameters
1 parent cbfd643 commit aa2df02

15 files changed

+348
-340
lines changed

‎manifests/init.pp

+86-87
Large diffs are not rendered by default.

‎manifests/resource/geo.pp

+8-8
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@
5252
# '192.168.0.0/16': 'intra'
5353

5454
define nginx::resource::geo (
55-
Hash $networks,
56-
Optional[String] $default = undef,
57-
Enum['present', 'absent'] $ensure = 'present',
58-
Boolean $ranges = false,
59-
Optional[String] $address = undef,
60-
Optional[String] $delete = undef,
61-
Optional[Array] $proxies = undef,
62-
Optional[Boolean] $proxy_recursive = undef
55+
Hash[Stdlib::IP::Address,String[1]] $networks,
56+
Optional[String[1]] $default = undef,
57+
Enum['present', 'absent'] $ensure = 'present',
58+
Boolean $ranges = false,
59+
Optional[String[1]] $address = undef,
60+
Optional[Stdlib::IP::Address] $delete = undef,
61+
Optional[Array[Stdlib::IP::Address]] $proxies = undef,
62+
Boolean $proxy_recursive = false
6363
) {
6464
if ! defined(Class['nginx']) {
6565
fail('You must include the nginx base class before using any defined resources')

‎manifests/resource/location.pp

+44-44
Original file line numberDiff line numberDiff line change
@@ -187,75 +187,75 @@
187187
Boolean $internal = false,
188188
String $location = $name,
189189
Variant[String[1],Array[String[1],1]] $server = undef,
190-
Optional[String] $www_root = undef,
191-
Optional[String] $autoindex = undef,
190+
Optional[String[1]] $www_root = undef,
191+
Optional[Nginx::Toggle] $autoindex = undef,
192192
Optional[Enum['on', 'off']] $autoindex_exact_size = undef,
193193
Optional[Enum['html', 'xml', 'json', 'jsonp']] $autoindex_format = undef,
194194
Optional[Enum['on', 'off']] $autoindex_localtime = undef,
195-
Array $index_files = [
195+
Array[String[1]] $index_files = [
196196
'index.html',
197197
'index.htm',
198198
'index.php',
199199
],
200-
Optional[String] $proxy = undef,
201-
Optional[String] $proxy_redirect = $nginx::proxy_redirect,
202-
String $proxy_read_timeout = $nginx::proxy_read_timeout,
203-
String $proxy_connect_timeout = $nginx::proxy_connect_timeout,
204-
String $proxy_send_timeout = $nginx::proxy_send_timeout,
205-
Array $proxy_set_header = $nginx::proxy_set_header,
206-
Array $proxy_hide_header = $nginx::proxy_hide_header,
207-
Array $proxy_pass_header = $nginx::proxy_pass_header,
208-
Array $proxy_ignore_header = $nginx::proxy_ignore_header,
209-
Optional[String] $proxy_next_upstream = undef,
210-
Optional[String] $fastcgi = undef,
211-
Optional[String] $fastcgi_index = undef,
212-
Optional[Hash] $fastcgi_param = undef,
213-
String $fastcgi_params = "${nginx::conf_dir}/fastcgi.conf",
214-
Optional[String] $fastcgi_script = undef,
215-
Optional[String] $fastcgi_split_path = undef,
200+
Optional[Stdlib::Httpurl] $proxy = undef,
201+
Optional[String[1]] $proxy_redirect = $nginx::proxy_redirect,
202+
Nginx::Duration $proxy_read_timeout = $nginx::proxy_read_timeout,
203+
Nginx::Duration $proxy_connect_timeout = $nginx::proxy_connect_timeout,
204+
Nginx::Duration $proxy_send_timeout = $nginx::proxy_send_timeout,
205+
Array[String[1]] $proxy_set_header = $nginx::proxy_set_header,
206+
Array[String[1]] $proxy_hide_header = $nginx::proxy_hide_header,
207+
Array[String[1]] $proxy_pass_header = $nginx::proxy_pass_header,
208+
Array[String[1]] $proxy_ignore_header = $nginx::proxy_ignore_header,
209+
Optional[String[1]] $proxy_next_upstream = undef,
210+
Optional[String[1]] $fastcgi = undef,
211+
Optional[String[1]] $fastcgi_index = undef,
212+
Optional[Hash[String[1],String[1]]] $fastcgi_param = undef,
213+
String[1] $fastcgi_params = "${nginx::conf_dir}/fastcgi.conf",
214+
Optional[String[1]] $fastcgi_script = undef,
215+
Optional[String[1]] $fastcgi_split_path = undef,
216216
Optional[String] $uwsgi = undef,
217217
Optional[Hash] $uwsgi_param = undef,
218-
String $uwsgi_params = "${nginx::config::conf_dir}/uwsgi_params",
219-
Optional[String] $uwsgi_read_timeout = undef,
218+
String[1] $uwsgi_params = "${nginx::config::conf_dir}/uwsgi_params",
219+
Optional[Nginx::Duration] $uwsgi_read_timeout = undef,
220220
Boolean $ssl = false,
221221
Boolean $ssl_only = false,
222-
Optional[String] $location_alias = undef,
222+
Optional[String[1]] $location_alias = undef,
223223
Optional[String[1]] $limit_zone = undef,
224224
Optional[Enum['any', 'all']] $location_satisfy = undef,
225-
Optional[Array] $location_allow = undef,
226-
Optional[Array] $location_deny = undef,
227-
Optional[Boolean] $stub_status = undef,
228-
Optional[Variant[String, Array]] $raw_prepend = undef,
229-
Optional[Variant[String, Array]] $raw_append = undef,
230-
Optional[Hash] $location_custom_cfg = undef,
231-
Optional[Hash] $location_cfg_prepend = undef,
232-
Optional[Hash] $location_cfg_append = undef,
233-
Optional[Hash] $location_custom_cfg_prepend = undef,
234-
Optional[Hash] $location_custom_cfg_append = undef,
235-
Optional[Array] $include = undef,
236-
Optional[Array] $try_files = undef,
225+
Optional[Array[String]] $location_allow = undef,
226+
Optional[Array[String]] $location_deny = undef,
227+
Boolean $stub_status = false,
228+
Optional[Variant[String, Array[String]]] $raw_prepend = undef,
229+
Optional[Variant[String, Array[String]]] $raw_append = undef,
230+
Optional[Nginx::Directives] $location_custom_cfg = undef,
231+
Optional[Nginx::Directives] $location_cfg_prepend = undef,
232+
Optional[Nginx::Directives] $location_cfg_append = undef,
233+
Optional[Nginx::Directives] $location_custom_cfg_prepend = undef,
234+
Optional[Nginx::Directives] $location_custom_cfg_append = undef,
235+
Optional[Array[String]] $include = undef,
236+
Optional[Array[String]] $try_files = undef,
237237
Optional[String] $proxy_cache = undef,
238238
Optional[String] $proxy_cache_key = undef,
239239
Optional[String] $proxy_cache_use_stale = undef,
240-
Optional[Enum['on', 'off']] $proxy_cache_lock = undef,
240+
Optional[Nginx::Toggle] $proxy_cache_lock = undef,
241241
Optional[Variant[Array, String]] $proxy_cache_valid = undef,
242242
Optional[Variant[Array, String]] $proxy_cache_bypass = undef,
243243
Optional[String] $proxy_method = undef,
244-
Optional[String] $proxy_http_version = undef,
245-
Optional[String] $proxy_set_body = undef,
246-
Optional[Enum['on', 'off']] $proxy_buffering = undef,
247-
Optional[Enum['on', 'off']] $proxy_request_buffering = undef,
244+
Optional[Enum['1.0','1.1']] $proxy_http_version = undef,
245+
Optional[String[1]] $proxy_set_body = undef,
246+
Optional[Nginx::Toggle] $proxy_buffering = undef,
247+
Optional[Nginx::Toggle] $proxy_request_buffering = undef,
248248
Optional[Nginx::Size] $proxy_max_temp_file_size = undef,
249249
Optional[Nginx::Size] $proxy_busy_buffers_size = undef,
250250
Optional[Enum['on', 'off']] $absolute_redirect = undef,
251-
Optional[String] $auth_basic = undef,
252-
Optional[String] $auth_basic_user_file = undef,
253-
Optional[String] $auth_request = undef,
254-
Array $rewrite_rules = [],
251+
Optional[String[1]] $auth_basic = undef,
252+
Optional[String[1]] $auth_basic_user_file = undef,
253+
Optional[String[1]] $auth_request = undef,
254+
Array[String[3]] $rewrite_rules = [],
255255
Integer[401,599] $priority = 500,
256256
Boolean $mp4 = false,
257257
Boolean $flv = false,
258-
Optional[String] $expires = undef,
258+
Optional[String[1]] $expires = undef,
259259
Nginx::Headers $add_header = {},
260260
Optional[Enum['on', 'off', 'always']] $gzip_static = undef,
261261
) {

‎manifests/resource/mailhost.pp

+43-43
Original file line numberDiff line numberDiff line change
@@ -76,49 +76,49 @@
7676
#
7777
define nginx::resource::mailhost (
7878
Stdlib::Port $listen_port,
79-
Enum['absent', 'present'] $ensure = 'present',
80-
Nginx::Listen::V4 $listen_ip = '*',
81-
Optional[String] $listen_options = undef,
82-
Boolean $ipv6_enable = false,
83-
Nginx::Listen::V6 $ipv6_listen_ip = '::',
84-
Stdlib::Port $ipv6_listen_port = 80,
85-
String $ipv6_listen_options = 'default ipv6only=on',
86-
Boolean $ssl = false,
87-
Optional[String] $ssl_cert = undef,
88-
String $ssl_ciphers = $nginx::ssl_ciphers,
89-
Optional[String] $ssl_client_cert = undef,
90-
Optional[String] $ssl_crl = undef,
91-
Optional[String] $ssl_dhparam = $nginx::ssl_dhparam,
92-
Optional[String] $ssl_ecdh_curve = undef,
93-
Optional[String] $ssl_key = undef,
94-
Optional[String] $ssl_password_file = undef,
95-
Optional[Stdlib::Port] $ssl_port = undef,
96-
Enum['on', 'off'] $ssl_prefer_server_ciphers = $nginx::ssl_prefer_server_ciphers,
97-
String $ssl_protocols = $nginx::ssl_protocols,
98-
Optional[String] $ssl_session_cache = undef,
99-
Optional[String] $ssl_session_ticket_key = undef,
100-
Optional[String] $ssl_session_tickets = undef,
101-
String $ssl_session_timeout = '5m',
102-
Optional[String] $ssl_trusted_cert = undef,
103-
Optional[Integer] $ssl_verify_depth = undef,
104-
Enum['on', 'off', 'only'] $starttls = 'off',
105-
Optional[Enum['imap', 'pop3', 'smtp']] $protocol = undef,
106-
Optional[String] $auth_http = undef,
107-
Optional[String] $auth_http_header = undef,
108-
Enum['on', 'off'] $xclient = 'on',
109-
Optional[String] $imap_auth = undef,
110-
Optional[Array] $imap_capabilities = undef,
111-
Optional[String] $imap_client_buffer = undef,
112-
Optional[String] $pop3_auth = undef,
113-
Optional[Array] $pop3_capabilities = undef,
114-
Optional[String] $smtp_auth = undef,
115-
Optional[Array] $smtp_capabilities = undef,
116-
Optional[Variant[Array, String]] $raw_prepend = undef,
117-
Optional[Variant[Array, String]] $raw_append = undef,
118-
Optional[Hash] $mailhost_cfg_prepend = undef,
119-
Optional[Hash] $mailhost_cfg_append = undef,
120-
String $proxy_pass_error_message = 'off',
121-
Array $server_name = [$name]
79+
Enum['absent', 'present'] $ensure = 'present',
80+
Nginx::Listen::V4 $listen_ip = '*',
81+
Optional[String[1]] $listen_options = undef,
82+
Boolean $ipv6_enable = false,
83+
Nginx::Listen::V6 $ipv6_listen_ip = '::',
84+
Stdlib::Port $ipv6_listen_port = 80,
85+
String $ipv6_listen_options = 'default ipv6only=on',
86+
Boolean $ssl = false,
87+
Optional[String[1]] $ssl_cert = undef,
88+
String $ssl_ciphers = $nginx::ssl_ciphers,
89+
Optional[String[1]] $ssl_client_cert = undef,
90+
Optional[String[1]] $ssl_crl = undef,
91+
Optional[String[1]] $ssl_dhparam = $nginx::ssl_dhparam,
92+
Optional[String[1]] $ssl_ecdh_curve = undef,
93+
Optional[String[1]] $ssl_key = undef,
94+
Optional[String[1]] $ssl_password_file = undef,
95+
Optional[Stdlib::Port] $ssl_port = undef,
96+
Nginx::Toggle $ssl_prefer_server_ciphers = $nginx::ssl_prefer_server_ciphers,
97+
String $ssl_protocols = $nginx::ssl_protocols,
98+
Optional[String[1]] $ssl_session_cache = undef,
99+
Optional[String[1]] $ssl_session_ticket_key = undef,
100+
Optional[Nginx::Toggle] $ssl_session_tickets = undef,
101+
Nginx::Duration $ssl_session_timeout = '5m',
102+
Optional[String[1]] $ssl_trusted_cert = undef,
103+
Optional[Integer] $ssl_verify_depth = undef,
104+
Enum['on', 'off', 'only'] $starttls = 'off',
105+
Optional[Enum['imap', 'pop3', 'smtp']] $protocol = undef,
106+
Optional[String[1]] $auth_http = undef,
107+
Optional[String[1]] $auth_http_header = undef,
108+
Nginx::Toggle $xclient = 'on',
109+
Optional[String[1]] $imap_auth = undef,
110+
Optional[Array[String[1]]] $imap_capabilities = undef,
111+
Optional[String[2]] $imap_client_buffer = undef,
112+
Optional[String[1]] $pop3_auth = undef,
113+
Optional[Array[String[1]]] $pop3_capabilities = undef,
114+
Optional[String[1]] $smtp_auth = undef,
115+
Optional[Array[String[1]]] $smtp_capabilities = undef,
116+
Optional[Variant[Array[String[1]], String[1]]] $raw_prepend = undef,
117+
Optional[Variant[Array[String[1]], String[1]]] $raw_append = undef,
118+
Optional[Nginx::Directives] $mailhost_cfg_prepend = undef,
119+
Optional[Nginx::Directives] $mailhost_cfg_append = undef,
120+
Nginx::Toggle $proxy_pass_error_message = 'off',
121+
Array[Stdlib::Host] $server_name = [$name]
122122
) {
123123
if ! defined(Class['nginx']) {
124124
fail('You must include the nginx base class before using any defined resources')

‎manifests/resource/map.pp

+6-6
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@
7272
# value: 'ny-pool-1'
7373
define nginx::resource::map (
7474
String[2] $string,
75-
Variant[Array, Hash] $mappings,
76-
Optional[String] $default = undef,
77-
Enum['absent', 'present'] $ensure = 'present',
78-
Array[String] $include_files = [],
79-
Boolean $hostnames = false,
80-
Enum['http', 'stream'] $context = 'http',
75+
Variant[Array[Hash[String[1],String]], Hash[String[1],String]] $mappings,
76+
Optional[String[1]] $default = undef,
77+
Enum['absent', 'present'] $ensure = 'present',
78+
Array[String[1]] $include_files = [],
79+
Boolean $hostnames = false,
80+
Enum['http', 'stream'] $context = 'http',
8181
) {
8282
if ! defined(Class['nginx']) {
8383
fail('You must include the nginx base class before using any defined resources')

0 commit comments

Comments
 (0)