From 20afc6adab373f17dd3f5d422edc1645bde367b3 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sun, 2 Apr 2023 13:38:31 +0200 Subject: [PATCH 1/2] Move static data from params.pp to init.pp --- REFERENCE.md | 26 +++++++++++++------------- manifests/init.pp | 18 +++++++++--------- manifests/params.pp | 8 -------- 3 files changed, 22 insertions(+), 30 deletions(-) diff --git a/REFERENCE.md b/REFERENCE.md index 37845428b..c4b86dcb3 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -397,11 +397,11 @@ Default value: `[]` ##### `global_owner` -Data type: `Any` +Data type: `String[1]` -Default value: `$nginx::params::global_owner` +Default value: `'root'` ##### `global_group` @@ -413,11 +413,11 @@ Default value: `$nginx::params::global_group` ##### `global_mode` -Data type: `Any` +Data type: `Stdlib::Filemode` -Default value: `$nginx::params::global_mode` +Default value: `'0644'` ##### `limit_req_zone` @@ -473,7 +473,7 @@ Data type: `Variant[String, Array[String]]` -Default value: `"${log_dir}/${nginx::params::http_access_log_file}"` +Default value: `"${log_dir}/access.log"` ##### `http_format_log` @@ -505,7 +505,7 @@ Data type: `Variant[String, Array[String]]` -Default value: `"${log_dir}/${nginx::params::nginx_error_log_file}"` +Default value: `"${log_dir}/error.log"` ##### `nginx_error_log_severity` @@ -541,11 +541,11 @@ Default value: `$nginx::params::root_group` ##### `sites_available_owner` -Data type: `Any` +Data type: `String[1]` -Default value: `$nginx::params::sites_available_owner` +Default value: `'root'` ##### `sites_available_group` @@ -557,11 +557,11 @@ Default value: `$nginx::params::sites_available_group` ##### `sites_available_mode` -Data type: `Any` +Data type: `Stdlib::Filemode` -Default value: `$nginx::params::sites_available_mode` +Default value: `'0644'` ##### `super_user` @@ -569,15 +569,15 @@ Data type: `Boolean` -Default value: `$nginx::params::super_user` +Default value: `true` ##### `temp_dir` -Data type: `Any` +Data type: `Stdlib::Absolutepath` -Default value: `$nginx::params::temp_dir` +Default value: `'/tmp'` ##### `server_purge` diff --git a/manifests/init.pp b/manifests/init.pp index 76ea5eb8d..eff2c6e93 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -54,29 +54,29 @@ $daemon_user = $nginx::params::daemon_user, $daemon_group = undef, Array[String] $dynamic_modules = [], - $global_owner = $nginx::params::global_owner, + String[1] $global_owner = 'root', $global_group = $nginx::params::global_group, - $global_mode = $nginx::params::global_mode, + Stdlib::Filemode $global_mode = '0644', Optional[Variant[String[1], Array[String[1]]]] $limit_req_zone = undef, Stdlib::Absolutepath $log_dir = $nginx::params::log_dir, Boolean $manage_log_dir = true, String[1] $log_user = $nginx::params::log_user, String[1] $log_group = $nginx::params::log_group, Stdlib::Filemode $log_mode = $nginx::params::log_mode, - Variant[String, Array[String]] $http_access_log = "${log_dir}/${nginx::params::http_access_log_file}", + Variant[String, Array[String]] $http_access_log = "${log_dir}/access.log", Optional[String] $http_format_log = undef, Variant[String, Array[String]] $stream_access_log = "${log_dir}/stream-access.log", Optional[String] $stream_custom_format_log = undef, - Variant[String, Array[String]] $nginx_error_log = "${log_dir}/${nginx::params::nginx_error_log_file}", + Variant[String, Array[String]] $nginx_error_log = "${log_dir}/error.log", Nginx::ErrorLogSeverity $nginx_error_log_severity = 'error', $pid = $nginx::params::pid, - Optional[Variant[Stdlib::Absolutepath, Tuple[Stdlib::Absolutepath, Integer, 1, 4]]] $proxy_temp_path = undef, + Optional[Variant[Stdlib::Absolutepath, Tuple[Stdlib::Absolutepath, Integer, 1, 4]]] $proxy_temp_path = undef, $root_group = $nginx::params::root_group, - $sites_available_owner = $nginx::params::sites_available_owner, + String[1] $sites_available_owner = 'root', $sites_available_group = $nginx::params::sites_available_group, - $sites_available_mode = $nginx::params::sites_available_mode, - Boolean $super_user = $nginx::params::super_user, - $temp_dir = $nginx::params::temp_dir, + Stdlib::Filemode $sites_available_mode = '0644', + Boolean $super_user = true, + Stdlib::Absolutepath $temp_dir = '/tmp', Boolean $server_purge = false, Boolean $include_modules_enabled = $nginx::params::include_modules_enabled, diff --git a/manifests/params.pp b/manifests/params.pp index 8b9281178..f78320c61 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -202,24 +202,16 @@ $log_user = $_module_parameters['log_user'] $log_group = $_module_parameters['log_group'] $log_mode = $_module_parameters['log_mode'] - $temp_dir = '/tmp' $pid = $_module_parameters['pid'] $include_modules_enabled = $_module_parameters['include_modules_enabled'] $daemon_user = $_module_parameters['daemon_user'] - $global_owner = 'root' $global_group = $_module_parameters['root_group'] - $global_mode = '0644' - $http_access_log_file = 'access.log' $manage_repo = $_module_parameters['manage_repo'] $mime_types = $_module_parameters['mime_types'] - $nginx_error_log_file = 'error.log' $root_group = $_module_parameters['root_group'] $package_name = $_module_parameters['package_name'] $passenger_package_name = $_module_parameters['passenger_package_name'] - $sites_available_owner = 'root' $sites_available_group = $_module_parameters['root_group'] - $sites_available_mode = '0644' - $super_user = true ### END Referenced Variables } From 4ac18a24de208f53f98edd1eb67a0d7ca3a90d52 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sun, 2 Apr 2023 13:46:03 +0200 Subject: [PATCH 2/2] Add datatypes to init.pp --- REFERENCE.md | 16 ++++++++-------- manifests/init.pp | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/REFERENCE.md b/REFERENCE.md index c4b86dcb3..a9b38b42a 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -357,7 +357,7 @@ Default value: `false` ##### `conf_dir` -Data type: `Any` +Data type: `Stdlib::Absolutepath` @@ -373,7 +373,7 @@ Default value: `undef` ##### `daemon_user` -Data type: `Any` +Data type: `String[1]` @@ -381,7 +381,7 @@ Default value: `$nginx::params::daemon_user` ##### `daemon_group` -Data type: `Any` +Data type: `Optional[String[1]]` @@ -405,7 +405,7 @@ Default value: `'root'` ##### `global_group` -Data type: `Any` +Data type: `String[1]` @@ -517,7 +517,7 @@ Default value: `'error'` ##### `pid` -Data type: `Any` +Data type: `Variant[Stdlib::Absolutepath,Boolean]` @@ -533,7 +533,7 @@ Default value: `undef` ##### `root_group` -Data type: `Any` +Data type: `String[1]` @@ -549,7 +549,7 @@ Default value: `'root'` ##### `sites_available_group` -Data type: `Any` +Data type: `String[1]` @@ -1520,7 +1520,7 @@ Default value: `'running'` ##### `service_enable` -Data type: `Any` +Data type: `Boolean` diff --git a/manifests/init.pp b/manifests/init.pp index eff2c6e93..b8e46dc4c 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -49,13 +49,13 @@ Optional[Variant[Stdlib::Absolutepath, Tuple[Stdlib::Absolutepath, Integer, 1, 4]]] $client_body_temp_path = undef, Boolean $confd_only = false, Boolean $confd_purge = false, - $conf_dir = $nginx::params::conf_dir, + Stdlib::Absolutepath $conf_dir = $nginx::params::conf_dir, Optional[Enum['on', 'off']] $daemon = undef, - $daemon_user = $nginx::params::daemon_user, - $daemon_group = undef, + String[1] $daemon_user = $nginx::params::daemon_user, + Optional[String[1]] $daemon_group = undef, Array[String] $dynamic_modules = [], String[1] $global_owner = 'root', - $global_group = $nginx::params::global_group, + String[1] $global_group = $nginx::params::global_group, Stdlib::Filemode $global_mode = '0644', Optional[Variant[String[1], Array[String[1]]]] $limit_req_zone = undef, Stdlib::Absolutepath $log_dir = $nginx::params::log_dir, @@ -69,11 +69,11 @@ Optional[String] $stream_custom_format_log = undef, Variant[String, Array[String]] $nginx_error_log = "${log_dir}/error.log", Nginx::ErrorLogSeverity $nginx_error_log_severity = 'error', - $pid = $nginx::params::pid, + Variant[Stdlib::Absolutepath,Boolean] $pid = $nginx::params::pid, Optional[Variant[Stdlib::Absolutepath, Tuple[Stdlib::Absolutepath, Integer, 1, 4]]] $proxy_temp_path = undef, - $root_group = $nginx::params::root_group, + String[1] $root_group = $nginx::params::root_group, String[1] $sites_available_owner = 'root', - $sites_available_group = $nginx::params::sites_available_group, + String[1] $sites_available_group = $nginx::params::sites_available_group, Stdlib::Filemode $sites_available_mode = '0644', Boolean $super_user = true, Stdlib::Absolutepath $temp_dir = '/tmp', @@ -213,7 +213,7 @@ ### START Service Configuation ### Stdlib::Ensure::Service $service_ensure = 'running', - $service_enable = true, + Boolean $service_enable = true, $service_flags = undef, $service_restart = undef, $service_name = 'nginx',