Skip to content

Commit 3677b16

Browse files
JacobHennerJacobHenner
committed
Add explicit parameter types to all parameters
1 parent 250300a commit 3677b16

20 files changed

+459
-455
lines changed

‎manifests/init.pp

Lines changed: 125 additions & 125 deletions
Large diffs are not rendered by default.

‎manifests/resource/geo.pp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@
5353

5454

5555
define nginx::resource::geo (
56-
Hash $networks,
57-
Optional[String] $default = undef,
58-
Enum['present', 'absent'] $ensure = 'present',
59-
Boolean $ranges = false,
60-
Optional[String] $address = undef,
61-
Optional[String] $delete = undef,
62-
Optional[Array] $proxies = undef,
63-
Optional[Boolean] $proxy_recursive = undef
56+
Hash[Stdlib::IP::Address,String[1]] $networks,
57+
Optional[String[1]] $default = undef,
58+
Enum['present', 'absent'] $ensure = 'present',
59+
Boolean $ranges = false,
60+
Optional[String[1]] $address = undef,
61+
Optional[Stdlib::IP::Address] $delete = undef,
62+
Optional[Array[Stdlib::IP::Address]] $proxies = undef,
63+
Boolean $proxy_recursive = false
6464
) {
6565

6666
if ! defined(Class['nginx']) {

‎manifests/resource/location.pp

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -160,71 +160,71 @@
160160
# }
161161

162162
define nginx::resource::location (
163-
Enum['present', 'absent'] $ensure = present,
164-
Boolean $internal = false,
165-
String $location = $name,
166-
String $server = undef,
167-
Optional[String] $www_root = undef,
168-
Optional[String] $autoindex = undef,
169-
Array $index_files = [
163+
Enum['present', 'absent'] $ensure = present,
164+
Boolean $internal = false,
165+
String $location = $name,
166+
String $server = undef,
167+
Optional[String[1]] $www_root = undef,
168+
Optional[Nginx::Toggle] $autoindex = undef,
169+
Array[String[1]] $index_files = [
170170
'index.html',
171171
'index.htm',
172172
'index.php'],
173-
Optional[String] $proxy = undef,
174-
Optional[String] $proxy_redirect = $::nginx::proxy_redirect,
175-
String $proxy_read_timeout = $::nginx::proxy_read_timeout,
176-
String $proxy_connect_timeout = $::nginx::proxy_connect_timeout,
177-
String $proxy_send_timeout = $::nginx::proxy_send_timeout,
178-
Array $proxy_set_header = $::nginx::proxy_set_header,
179-
Array $proxy_hide_header = $::nginx::proxy_hide_header,
180-
Array $proxy_pass_header = $::nginx::proxy_pass_header,
181-
Array $proxy_ignore_header = $::nginx::proxy_ignore_header,
182-
Optional[String] $proxy_next_upstream = undef,
183-
Optional[String] $fastcgi = undef,
184-
Optional[String] $fastcgi_index = undef,
185-
Optional[Hash] $fastcgi_param = undef,
186-
String $fastcgi_params = "${::nginx::conf_dir}/fastcgi.conf",
187-
Optional[String] $fastcgi_script = undef,
188-
Optional[String] $fastcgi_split_path = undef,
189-
Optional[String] $uwsgi = undef,
190-
Optional[Hash] $uwsgi_param = undef,
191-
String $uwsgi_params = "${nginx::config::conf_dir}/uwsgi_params",
192-
Optional[String] $uwsgi_read_timeout = undef,
193-
Boolean $ssl = false,
194-
Boolean $ssl_only = false,
195-
Optional[String] $location_alias = undef,
196-
Optional[Enum['any', 'all']] $location_satisfy = undef,
197-
Optional[Array] $location_allow = undef,
198-
Optional[Array] $location_deny = undef,
199-
Optional[Boolean ] $stub_status = undef,
200-
Optional[Variant[String, Array]] $raw_prepend = undef,
201-
Optional[Variant[String, Array]] $raw_append = undef,
202-
Optional[Hash] $location_custom_cfg = undef,
203-
Optional[Hash] $location_cfg_prepend = undef,
204-
Optional[Hash] $location_cfg_append = undef,
205-
Optional[Hash] $location_custom_cfg_prepend = undef,
206-
Optional[Hash] $location_custom_cfg_append = undef,
207-
Optional[Array] $include = undef,
208-
Optional[Array] $try_files = undef,
209-
Optional[String] $proxy_cache = undef,
210-
Optional[String] $proxy_cache_key = undef,
211-
Optional[String] $proxy_cache_use_stale = undef,
212-
Optional[Enum['on', 'off']] $proxy_cache_lock = undef,
213-
Optional[Variant[Array, String]] $proxy_cache_valid = undef,
214-
Optional[Variant[Array, String]] $proxy_cache_bypass = undef,
215-
Optional[String] $proxy_method = undef,
216-
Optional[String] $proxy_http_version = undef,
217-
Optional[String] $proxy_set_body = undef,
218-
Optional[Enum['on', 'off']] $proxy_buffering = undef,
219-
Optional[String] $auth_basic = undef,
220-
Optional[String] $auth_basic_user_file = undef,
221-
Optional[String] $auth_request = undef,
222-
Array $rewrite_rules = [],
223-
Integer[401,599] $priority = 500,
224-
Boolean $mp4 = false,
225-
Boolean $flv = false,
226-
Optional[String] $expires = undef,
227-
Hash $add_header = {},
173+
Optional[Stdlib::Httpurl] $proxy = undef,
174+
Optional[String[1]] $proxy_redirect = $::nginx::proxy_redirect,
175+
Nginx::Duration $proxy_read_timeout = $::nginx::proxy_read_timeout,
176+
Nginx::Duration $proxy_connect_timeout = $::nginx::proxy_connect_timeout,
177+
Nginx::Duration $proxy_send_timeout = $::nginx::proxy_send_timeout,
178+
Array[String[1]] $proxy_set_header = $::nginx::proxy_set_header,
179+
Array[String[1]] $proxy_hide_header = $::nginx::proxy_hide_header,
180+
Array[String[1]] $proxy_pass_header = $::nginx::proxy_pass_header,
181+
Array[String[1]] $proxy_ignore_header = $::nginx::proxy_ignore_header,
182+
Optional[String] $proxy_next_upstream = undef,
183+
Optional[String] $fastcgi = undef,
184+
Optional[String[1]] $fastcgi_index = undef,
185+
Optional[Hash[String[1],String[1]]] $fastcgi_param = undef,
186+
String[1] $fastcgi_params = "${::nginx::conf_dir}/fastcgi.conf",
187+
Optional[String[1]] $fastcgi_script = undef,
188+
Optional[String[1]] $fastcgi_split_path = undef,
189+
Optional[String] $uwsgi = undef,
190+
Optional[Hash[String[1],String]] $uwsgi_param = undef,
191+
String[1] $uwsgi_params = "${nginx::config::conf_dir}/uwsgi_params",
192+
Optional[Nginx::Duration] $uwsgi_read_timeout = undef,
193+
Boolean $ssl = false,
194+
Boolean $ssl_only = false,
195+
Optional[String[1]] $location_alias = undef,
196+
Optional[Enum['any', 'all']] $location_satisfy = undef,
197+
Optional[Array[String]] $location_allow = undef,
198+
Optional[Array[String]] $location_deny = undef,
199+
Boolean $stub_status = false,
200+
Optional[Variant[String, Array[String]]] $raw_prepend = undef,
201+
Optional[Variant[String, Array[String]]] $raw_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,
207+
Optional[Array[String]] $include = undef,
208+
Optional[Array[String]] $try_files = undef,
209+
Optional[String] $proxy_cache = undef,
210+
Optional[String] $proxy_cache_key = undef,
211+
Optional[String] $proxy_cache_use_stale = undef,
212+
Optional[Nginx::Toggle] $proxy_cache_lock = undef,
213+
Optional[Variant[Array[String], String]] $proxy_cache_valid = undef,
214+
Optional[Variant[Array[String], String]] $proxy_cache_bypass = undef,
215+
Optional[String] $proxy_method = undef,
216+
Optional[Enum['1.0','1.1']] $proxy_http_version = undef,
217+
Optional[String[1]] $proxy_set_body = undef,
218+
Optional[Nginx::Toggle] $proxy_buffering = undef,
219+
Optional[String[1]] $auth_basic = undef,
220+
Optional[String[1]] $auth_basic_user_file = undef,
221+
Optional[String[1]] $auth_request = undef,
222+
Array[String[3]] $rewrite_rules = [],
223+
Integer[401,599] $priority = 500,
224+
Boolean $mp4 = false,
225+
Boolean $flv = false,
226+
Optional[String[1]] $expires = undef,
227+
Hash[String[1],String] $add_header = {},
228228
) {
229229

230230
if ! defined(Class['nginx']) {

‎manifests/resource/mailhost.pp

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -77,50 +77,50 @@
7777
# }
7878
#
7979
define nginx::resource::mailhost (
80-
Integer $listen_port,
81-
Enum['absent', 'present'] $ensure = 'present',
82-
Variant[Array[String], String] $listen_ip = '*',
83-
Optional[String] $listen_options = undef,
84-
Boolean $ipv6_enable = false,
85-
Variant[Array[String], String] $ipv6_listen_ip = '::',
86-
Integer $ipv6_listen_port = 80,
87-
String $ipv6_listen_options = 'default ipv6only=on',
88-
Boolean $ssl = false,
89-
Optional[String] $ssl_cert = undef,
90-
String $ssl_ciphers = $::nginx::ssl_ciphers,
91-
Optional[String] $ssl_client_cert = undef,
92-
Optional[String] $ssl_crl = undef,
93-
Optional[String] $ssl_dhparam = $::nginx::ssl_dhparam,
94-
Optional[String] $ssl_ecdh_curve = undef,
95-
Optional[String] $ssl_key = undef,
96-
Optional[String] $ssl_password_file = undef,
97-
Optional[Integer] $ssl_port = undef,
98-
Enum['on', 'off'] $ssl_prefer_server_ciphers = $::nginx::ssl_prefer_server_ciphers,
99-
String $ssl_protocols = $::nginx::ssl_protocols,
100-
Optional[String] $ssl_session_cache = undef,
101-
Optional[String] $ssl_session_ticket_key = undef,
102-
Optional[String] $ssl_session_tickets = undef,
103-
String $ssl_session_timeout = '5m',
104-
Optional[String] $ssl_trusted_cert = undef,
105-
Optional[Integer] $ssl_verify_depth = undef,
106-
Enum['on', 'off', 'only'] $starttls = 'off',
107-
$protocol = undef,
108-
Optional[String] $auth_http = undef,
109-
Optional[String] $auth_http_header = undef,
110-
String $xclient = 'on',
111-
Optional[String] $imap_auth = undef,
112-
Optional[Array] $imap_capabilities = undef,
113-
Optional[String] $imap_client_buffer = undef,
114-
Optional[String] $pop3_auth = undef,
115-
Optional[Array] $pop3_capabilities = undef,
116-
Optional[String] $smtp_auth = undef,
117-
Optional[Array] $smtp_capabilities = undef,
118-
Optional[Variant[Array, String]] $raw_prepend = undef,
119-
Optional[Variant[Array, String]] $raw_append = undef,
120-
Optional[Hash] $mailhost_cfg_prepend = undef,
121-
Optional[Hash] $mailhost_cfg_append = undef,
122-
String $proxy_pass_error_message = 'off',
123-
Array $server_name = [$name]
80+
Stdlib::Port $listen_port,
81+
Enum['absent', 'present'] $ensure = 'present',
82+
Variant[Enum['*'], Array[Stdlib::Ipv4], Stdlib::Ipv4] $listen_ip = '*',
83+
Optional[String[1]] $listen_options = undef,
84+
Boolean $ipv6_enable = false,
85+
Variant[Array[Stdlib::Ipv6], Stdlib::Ipv6] $ipv6_listen_ip = '::',
86+
Stdlib::Port $ipv6_listen_port = 80,
87+
String $ipv6_listen_options = 'default ipv6only=on',
88+
Boolean $ssl = false,
89+
Optional[String[1]] $ssl_cert = undef,
90+
String $ssl_ciphers = $::nginx::ssl_ciphers,
91+
Optional[String[1]] $ssl_client_cert = undef,
92+
Optional[String[1]] $ssl_crl = undef,
93+
Optional[String[1]] $ssl_dhparam = $::nginx::ssl_dhparam,
94+
Optional[String[1]] $ssl_ecdh_curve = undef,
95+
Optional[String[1]] $ssl_key = undef,
96+
Optional[String[1]] $ssl_password_file = undef,
97+
Optional[Stdlib::Port] $ssl_port = undef,
98+
Nginx::Toggle $ssl_prefer_server_ciphers = $::nginx::ssl_prefer_server_ciphers,
99+
String $ssl_protocols = $::nginx::ssl_protocols,
100+
Optional[String[1]] $ssl_session_cache = undef,
101+
Optional[String[1]] $ssl_session_ticket_key = undef,
102+
Optional[Nginx::Toggle] $ssl_session_tickets = undef,
103+
Nginx::Duration $ssl_session_timeout = '5m',
104+
Optional[String[1]] $ssl_trusted_cert = undef,
105+
Optional[Integer] $ssl_verify_depth = undef,
106+
Enum['on', 'off', 'only'] $starttls = 'off',
107+
Optional[Enum['imap', 'pop3', 'smtp']] $protocol = undef,
108+
Optional[String[1]] $auth_http = undef,
109+
Optional[String[1]] $auth_http_header = undef,
110+
Nginx::Toggle $xclient = 'on',
111+
Optional[String[1]] $imap_auth = undef,
112+
Optional[Array[String[1]]] $imap_capabilities = undef,
113+
Optional[String[2]] $imap_client_buffer = undef,
114+
Optional[String[1]] $pop3_auth = undef,
115+
Optional[Array[String[1]]] $pop3_capabilities = undef,
116+
Optional[String[1]] $smtp_auth = undef,
117+
Optional[Array[String[1]]] $smtp_capabilities = undef,
118+
Optional[Variant[Array[String[1]], String[1]]] $raw_prepend = undef,
119+
Optional[Variant[Array[String[1]], String[1]]] $raw_append = undef,
120+
Optional[Nginx::Directives] $mailhost_cfg_prepend = undef,
121+
Optional[Nginx::Directives] $mailhost_cfg_append = undef,
122+
Nginx::Toggle $proxy_pass_error_message = 'off',
123+
Array[Stdlib::Host] $server_name = [$name]
124124
) {
125125

126126
if ! defined(Class['nginx']) {

‎manifests/resource/map.pp

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

7474
define nginx::resource::map (
7575
String[2] $string,
76-
Variant[Array, Hash] $mappings,
77-
Optional[String] $default = undef,
78-
Enum['absent', 'present'] $ensure = 'present',
79-
Array[String] $include_files = [],
80-
Boolean $hostnames = false
76+
Variant[Array[Hash[String[1],String]], Hash[String[1],String]] $mappings,
77+
Optional[String[1]] $default = undef,
78+
Enum['absent', 'present'] $ensure = 'present',
79+
Array[String[1]] $include_files = [],
80+
Boolean $hostnames = false
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)