Skip to content

Commit 6d2dbdb

Browse files
Enricesebastianrakel
Enrice
authored and
sebastianrakel
committed
streamline defaults with nginx
1 parent f5230c3 commit 6d2dbdb

File tree

17 files changed

+704
-685
lines changed

17 files changed

+704
-685
lines changed

‎REFERENCE.md‎

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

‎manifests/init.pp‎

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

‎manifests/resource/location.pp‎

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

‎manifests/resource/mailhost.pp‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -133,63 +133,63 @@
133133
#
134134
define nginx::resource::mailhost (
135135
Stdlib::Port $listen_port,
136-
Enum['absent', 'present'] $ensure = 'present',
137-
Variant[Array[String], String] $listen_ip = '*',
138-
Optional[String] $listen_options = undef,
139-
Boolean $ipv6_enable = false,
140-
Variant[Array[String], String] $ipv6_listen_ip = '::',
141-
Stdlib::Port $ipv6_listen_port = $listen_port,
142-
Optional[String[1]] $ipv6_listen_options = undef,
143-
Boolean $ssl = false,
144-
Optional[String] $ssl_cert = undef,
145-
String $ssl_ciphers = $nginx::ssl_ciphers,
146-
Optional[String] $ssl_client_cert = undef,
147-
Optional[String] $ssl_crl = undef,
148-
Optional[String] $ssl_dhparam = $nginx::ssl_dhparam,
149-
Optional[String] $ssl_ecdh_curve = undef,
150-
Optional[String] $ssl_key = undef,
151-
Optional[String] $ssl_password_file = undef,
152-
Optional[Stdlib::Port] $ssl_port = undef,
153-
Enum['on', 'off'] $ssl_prefer_server_ciphers = $nginx::ssl_prefer_server_ciphers,
154-
String $ssl_protocols = $nginx::ssl_protocols,
155-
Optional[String] $ssl_session_cache = undef,
156-
Optional[String] $ssl_session_ticket_key = undef,
157-
Optional[String] $ssl_session_tickets = undef,
158-
String $ssl_session_timeout = '5m',
159-
Optional[String] $ssl_trusted_cert = undef,
160-
Optional[Integer] $ssl_verify_depth = undef,
161-
Enum['on', 'off', 'only'] $starttls = 'off',
136+
Enum['absent', 'present'] $ensure = 'present',
137+
Variant[Array[String], String] $listen_ip = '*',
138+
Optional[String] $listen_options = undef,
139+
Boolean $ipv6_enable = false,
140+
Variant[Array[String], String] $ipv6_listen_ip = '::',
141+
Stdlib::Port $ipv6_listen_port = $listen_port,
142+
Optional[String[1]] $ipv6_listen_options = undef,
143+
Boolean $ssl = false,
144+
Optional[String] $ssl_cert = undef,
145+
Optional[String] $ssl_ciphers = $nginx::ssl_ciphers,
146+
Optional[String] $ssl_client_cert = undef,
147+
Optional[String] $ssl_crl = undef,
148+
Optional[String] $ssl_dhparam = $nginx::ssl_dhparam,
149+
Optional[String] $ssl_ecdh_curve = undef,
150+
Optional[String] $ssl_key = undef,
151+
Optional[String] $ssl_password_file = undef,
152+
Optional[Stdlib::Port] $ssl_port = undef,
153+
Optional[Enum['on', 'off']] $ssl_prefer_server_ciphers = $nginx::ssl_prefer_server_ciphers,
154+
Optional[String] $ssl_protocols = $nginx::ssl_protocols,
155+
Optional[String] $ssl_session_cache = undef,
156+
Optional[String] $ssl_session_ticket_key = undef,
157+
Optional[String] $ssl_session_tickets = undef,
158+
String $ssl_session_timeout = '5m',
159+
Optional[String] $ssl_trusted_cert = undef,
160+
Optional[Integer] $ssl_verify_depth = undef,
161+
Enum['on', 'off', 'only'] $starttls = 'off',
162162
Optional[Enum['imap', 'pop3', 'sieve', 'smtp']] $protocol = undef,
163-
Optional[String] $auth_http = undef,
164-
Optional[String] $auth_http_header = undef,
165-
Enum['on', 'off'] $xclient = 'on',
166-
Enum['on', 'off'] $proxy_protocol = 'off',
167-
Enum['on', 'off'] $proxy_smtp_auth = 'off',
168-
Optional[String] $imap_auth = undef,
169-
Optional[Array] $imap_capabilities = undef,
170-
Optional[String] $imap_client_buffer = undef,
171-
Optional[String] $pop3_auth = undef,
172-
Optional[Array] $pop3_capabilities = undef,
173-
Optional[String] $smtp_auth = undef,
174-
Optional[Array] $smtp_capabilities = undef,
175-
String $proxy_pass_error_message = 'off',
176-
Array $server_name = [$name],
177-
Variant[Array[String], String] $raw_prepend = [],
178-
Variant[Array[String], String] $raw_append = [],
163+
Optional[String] $auth_http = undef,
164+
Optional[String] $auth_http_header = undef,
165+
Enum['on', 'off'] $xclient = 'on',
166+
Enum['on', 'off'] $proxy_protocol = 'off',
167+
Enum['on', 'off'] $proxy_smtp_auth = 'off',
168+
Optional[String] $imap_auth = undef,
169+
Optional[Array] $imap_capabilities = undef,
170+
Optional[String] $imap_client_buffer = undef,
171+
Optional[String] $pop3_auth = undef,
172+
Optional[Array] $pop3_capabilities = undef,
173+
Optional[String] $smtp_auth = undef,
174+
Optional[Array] $smtp_capabilities = undef,
175+
String $proxy_pass_error_message = 'off',
176+
Array $server_name = [$name],
177+
Variant[Array[String], String] $raw_prepend = [],
178+
Variant[Array[String], String] $raw_append = [],
179179
Hash[String,
180180
Variant[
181181
String,
182182
Array[String],
183183
Hash[String, Variant[String, Array[String]]],
184184
]
185-
] $mailhost_cfg_prepend = {},
185+
] $mailhost_cfg_prepend = {},
186186
Hash[String,
187187
Variant[
188188
String,
189189
Array[String],
190190
Hash[String, Variant[String, Array[String]]],
191191
]
192-
] $mailhost_cfg_append = {},
192+
] $mailhost_cfg_append = {},
193193
) {
194194
if ! defined(Class['nginx']) {
195195
fail('You must include the nginx base class before using any defined resources')

‎manifests/resource/map.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878

7979
$root_group = $nginx::root_group
8080

81-
$conf_dir = $context ? {
81+
$conf_dir = $context ? {
8282
'stream' => "${nginx::conf_dir}/conf.stream.d",
8383
'http' => "${nginx::conf_dir}/conf.d",
8484
}

0 commit comments

Comments
 (0)