Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

init.pp: Add missing datatypes #1560

Merged
merged 5 commits into from
Jul 6, 2023
Merged

init.pp: Add missing datatypes #1560

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e15b11a
init.pp: Add missing datatypes
bastelfreak Jun 28, 2023
92aa72c
Prefer usage of Nginx::Size and Nginx::Time over String
smortex Jul 5, 2023
89496d2
Extend supported values for Nginx::Size and Nginx::Time
smortex Jul 5, 2023
d27b04c
Regenerate REFERENCE.md
smortex Jul 5, 2023
4b1a932
Fix incorrect data types
smortex Jul 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 29 additions & 29 deletions REFERENCE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,15 +629,15 @@ Default value: `'on'`

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

Data type: `Any`
Data type: `String`



Default value: `'500ms'`

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

Data type: `Any`
Data type: `String`



Expand All @@ -653,23 +653,23 @@ Default value: `'10m'`

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

Data type: `Any`
Data type: `String`



Default value: `'60s'`

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

Data type: `Any`
Data type: `String`



Default value: `'60s'`

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

Data type: `Any`
Data type: `String`



Expand Down Expand Up @@ -773,39 +773,39 @@ Default value: `'off'`

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

Data type: `Any`
Data type: `Optional[String]`



Default value: `undef`

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

Data type: `Any`
Data type: `Integer`



Default value: `1`

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

Data type: `Any`
Data type: `String`



Default value: `'msie6'`

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

Data type: `Any`
Data type: `Integer`



Default value: `20`

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

Data type: `Any`
Data type: `Float`



Expand All @@ -821,7 +821,7 @@ Default value: `'off'`

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

Data type: `Any`
Data type: `Optional[Variant[String[1],Array[String[1]]]]`



Expand Down Expand Up @@ -893,15 +893,15 @@ Default value: `'off'`

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

Data type: `Any`
Data type: `String`



Default value: `'65s'`

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

Data type: `Any`
Data type: `String`



Expand Down Expand Up @@ -989,7 +989,7 @@ Default value: `512`

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

Data type: `Any`
Data type: `Variant[Boolean,Array,Hash]`



Expand Down Expand Up @@ -1085,7 +1085,7 @@ Default value: `undef`

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

Data type: `Any`
Data type: `String`



Expand All @@ -1109,23 +1109,23 @@ Default value: `undef`

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

Data type: `Any`
Data type: `String`



Default value: `'90s'`

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

Data type: `Any`
Data type: `Optional[String]`



Default value: `undef`

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

Data type: `Any`
Data type: `String`



Expand Down Expand Up @@ -1256,15 +1256,15 @@ Default value: `true`

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

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



Default value: `'512'`

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

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



Expand Down Expand Up @@ -1432,31 +1432,31 @@ Default value: `undef`

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

Data type: `Any`
Data type: `String`



Default value: `installed`

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

Data type: `Any`
Data type: `String`



Default value: `$nginx::params::package_name`

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

Data type: `Any`
Data type: `String`



Default value: `'nginx'`

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

Data type: `Any`
Data type: `Optional[String]`



Expand Down Expand Up @@ -1496,7 +1496,7 @@ Default value: `undef`

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

Data type: `Any`
Data type: `String`



Expand Down Expand Up @@ -1528,31 +1528,31 @@ Default value: `true`

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

Data type: `Any`
Data type: `Optional[String]`



Default value: `undef`

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

Data type: `Any`
Data type: `Optional[String]`



Default value: `undef`

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

Data type: `Any`
Data type: `String`



Default value: `'nginx'`

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

Data type: `Any`
Data type: `Boolean`



Expand Down
58 changes: 29 additions & 29 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,12 @@
### START Nginx Configuration ###
Optional[Enum['on', 'off']] $absolute_redirect = undef,
Enum['on', 'off'] $accept_mutex = 'on',
$accept_mutex_delay = '500ms',
$client_body_buffer_size = '128k',
String $accept_mutex_delay = '500ms',
String $client_body_buffer_size = '128k',
String $client_max_body_size = '10m',
$client_body_timeout = '60s',
$send_timeout = '60s',
$lingering_timeout = '5s',
String $client_body_timeout = '60s',
smortex marked this conversation as resolved.
Show resolved Hide resolved
String $send_timeout = '60s',
String $lingering_timeout = '5s',
Optional[Enum['on','off','always']] $lingering_close = undef,
Optional[String[1]] $lingering_time = undef,
Optional[Enum['on', 'off']] $etag = undef,
Expand All @@ -107,13 +107,13 @@
Optional[String] $fastcgi_cache_path = undef,
Optional[String] $fastcgi_cache_use_stale = undef,
Enum['on', 'off'] $gzip = 'off',
$gzip_buffers = undef,
$gzip_comp_level = 1,
$gzip_disable = 'msie6',
$gzip_min_length = 20,
$gzip_http_version = 1.1,
Optional[String] $gzip_buffers = undef,
Integer $gzip_comp_level = 1,
String $gzip_disable = 'msie6',
Integer $gzip_min_length = 20,
Float $gzip_http_version = 1.1,
smortex marked this conversation as resolved.
Show resolved Hide resolved
Nginx::GzipProxied $gzip_proxied = 'off',
$gzip_types = undef,
Optional[Variant[String[1],Array[String[1]]]] $gzip_types = undef,
Enum['on', 'off'] $gzip_vary = 'off',
Optional[Enum['on', 'off', 'always']] $gzip_static = undef,
Optional[Variant[Hash, Array]] $http_cfg_prepend = undef,
Expand All @@ -122,8 +122,8 @@
Optional[Variant[Array[String], String]] $http_raw_append = undef,
Enum['on', 'off'] $http_tcp_nodelay = 'on',
Enum['on', 'off'] $http_tcp_nopush = 'off',
$keepalive_timeout = '65s',
$keepalive_requests = '100',
String $keepalive_timeout = '65s',
String $keepalive_requests = '100',
smortex marked this conversation as resolved.
Show resolved Hide resolved
Hash[String[1], Nginx::LogFormat] $log_format = {},
Hash[String[1], Nginx::LogFormat] $stream_log_format = {},
Boolean $mail = false,
Expand All @@ -134,7 +134,7 @@
String $multi_accept = 'off',
Integer $names_hash_bucket_size = 64,
Integer $names_hash_max_size = 512,
$nginx_cfg_prepend = false,
Variant[Boolean,Array,Hash] $nginx_cfg_prepend = false,
String $proxy_buffers = '32 4k',
String $proxy_buffer_size = '8k',
String $proxy_cache_inactive = '20m',
Expand All @@ -146,12 +146,12 @@
Optional[String] $proxy_cache_loader_sleep = undef,
Optional[String] $proxy_cache_loader_threshold = undef,
Optional[Enum['on', 'off']] $proxy_use_temp_path = undef,
$proxy_connect_timeout = '90s',
String $proxy_connect_timeout = '90s',
Integer $proxy_headers_hash_bucket_size = 64,
Optional[String] $proxy_http_version = undef,
$proxy_read_timeout = '90s',
$proxy_redirect = undef,
$proxy_send_timeout = '90s',
String $proxy_read_timeout = '90s',
Optional[String] $proxy_redirect = undef,
String $proxy_send_timeout = '90s',
Array $proxy_set_header = [
'Host $host',
'X-Real-IP $remote_addr',
Expand All @@ -173,8 +173,8 @@
Enum['on', 'off'] $ssl_stapling_verify = 'off',
Stdlib::Absolutepath $snippets_dir = $nginx::params::snippets_dir,
Boolean $manage_snippets_dir = true,
$types_hash_bucket_size = '512',
$types_hash_max_size = '1024',
Variant[Integer,String] $types_hash_bucket_size = '512',
Variant[Integer,String] $types_hash_max_size = '1024',
smortex marked this conversation as resolved.
Show resolved Hide resolved
Integer $worker_connections = 1024,
Enum['on', 'off'] $ssl_prefer_server_ciphers = 'on',
Variant[Integer, Enum['auto']] $worker_processes = 'auto',
Expand All @@ -198,26 +198,26 @@
Optional[Enum['on', 'off']] $reset_timedout_connection = undef,

### START Package Configuration ###
$package_ensure = installed,
$package_name = $nginx::params::package_name,
$package_source = 'nginx',
$package_flavor = undef,
String $package_ensure = installed,
String $package_name = $nginx::params::package_name,
String $package_source = 'nginx',
Optional[String] $package_flavor = undef,
Boolean $manage_repo = $nginx::params::manage_repo,
Hash[String[1], String[1]] $mime_types = $nginx::params::mime_types,
Boolean $mime_types_preserve_defaults = false,
Optional[String] $repo_release = undef,
$passenger_package_ensure = installed,
String $passenger_package_ensure = installed,
String[1] $passenger_package_name = $nginx::params::passenger_package_name,
Optional[Stdlib::HTTPUrl] $repo_source = undef,
### END Package Configuration ###

### START Service Configuation ###
Stdlib::Ensure::Service $service_ensure = 'running',
Boolean $service_enable = true,
$service_flags = undef,
$service_restart = undef,
$service_name = 'nginx',
$service_manage = true,
Optional[String] $service_flags = undef,
Optional[String] $service_restart = undef,
String $service_name = 'nginx',
Boolean $service_manage = true,
Boolean $service_config_check = false,
String $service_config_check_command = 'nginx -t',
### END Service Configuration ###
Expand Down