Skip to content

Commit

Permalink
Remove legacy data types
Browse files Browse the repository at this point in the history
These data types where kept for backwards compatibility, but are
syntaxically incorrect.

Remove them.
  • Loading branch information
smortex committed Nov 5, 2023
1 parent 16b38fb commit 722b124
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 11 deletions.
4 changes: 2 additions & 2 deletions REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -807,7 +807,7 @@ Default value: `20`

##### <a name="-nginx--gzip_http_version"></a>`gzip_http_version`

Data type: `Variant[Enum['1.0','1.1'], Float]`
Data type: `Enum['1.0','1.1']`



Expand Down Expand Up @@ -903,7 +903,7 @@ Default value: `'65s'`

##### <a name="-nginx--keepalive_requests"></a>`keepalive_requests`

Data type: `Variant[Integer, String]`
Data type: `Integer`



Expand Down
11 changes: 2 additions & 9 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
Integer $gzip_comp_level = 1,
String $gzip_disable = 'msie6',
Integer $gzip_min_length = 20,
Variant[Enum['1.0','1.1'], Float] $gzip_http_version = '1.1',
Enum['1.0','1.1'] $gzip_http_version = '1.1',
Variant[Nginx::GzipProxied, Array[Nginx::GzipProxied]] $gzip_proxied = 'off',
Optional[Variant[String[1],Array[String[1]]]] $gzip_types = undef,
Enum['on', 'off'] $gzip_vary = 'off',
Expand All @@ -123,7 +123,7 @@
Enum['on', 'off'] $http_tcp_nodelay = 'on',
Enum['on', 'off'] $http_tcp_nopush = 'off',
Nginx::Time $keepalive_timeout = '65s',
Variant[Integer, String] $keepalive_requests = 100,
Integer $keepalive_requests = 100,
Hash[String[1], Nginx::LogFormat] $log_format = {},
Hash[String[1], Nginx::LogFormat] $stream_log_format = {},
Boolean $mail = false,
Expand Down Expand Up @@ -244,13 +244,6 @@

### END Hiera Lookups ###
) inherits nginx::params {
if $gzip_http_version =~ Float {
deprecation('gzip_http_version', 'Passing a Float is deprecated, please pass a String')
}
if $keepalive_requests =~ String {
deprecation('keepalive_requests', 'Passing a String is deprecated, please pass a Integer')
}

contain 'nginx::package'
contain 'nginx::config'
contain 'nginx::service'
Expand Down

0 comments on commit 722b124

Please sign in to comment.