From 08568375769fe4d0666658ef1f6647b93c88952f Mon Sep 17 00:00:00 2001 From: anesterova Date: Thu, 23 Jun 2022 20:13:45 +0300 Subject: [PATCH 1/2] foreman-proxy group creation --- manifests/config.pp | 6 ++++-- manifests/init.pp | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/manifests/config.pp b/manifests/config.pp index 618108f7..16c7e07e 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -46,8 +46,10 @@ system => true, } - group { $foreman_proxy::group: - system => true, + if $foreman_proxy::manage_foreman_proxy_group { + group { $foreman_proxy::group: + system => true, + } } # Provided by packaging, defined here to allow autorequire for files diff --git a/manifests/init.pp b/manifests/init.pp index a25060a5..98479591 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -76,6 +76,8 @@ # $manage_puppet_group:: Whether to ensure the $puppet_group exists. Also ensures group owner of ssl keys and certs is $puppet_group # Not applicable when ssl is false. # +# $manage_foreman_proxy_group:: Whether to manage foreman-proxy group creation. +# # $puppet:: Enable Puppet module for environment imports and Puppet runs # # $puppet_listen_on:: Protocols for the Puppet feature to listen on @@ -324,6 +326,7 @@ Integer[0] $puppetca_token_ttl = 360, Optional[Stdlib::Absolutepath] $puppetca_certificate = undef, Boolean $manage_puppet_group = true, + Boolean $manage_foreman_proxy_group = true, Boolean $puppet = true, Foreman_proxy::ListenOn $puppet_listen_on = 'https', Stdlib::HTTPUrl $puppet_url = $foreman_proxy::params::puppet_url, From 770753689d617771a29a5856ced9d62a07c406a3 Mon Sep 17 00:00:00 2001 From: anesterova Date: Thu, 23 Jun 2022 20:37:21 +0300 Subject: [PATCH 2/2] changed var description --- manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index 98479591..9f7de3f0 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -76,7 +76,7 @@ # $manage_puppet_group:: Whether to ensure the $puppet_group exists. Also ensures group owner of ssl keys and certs is $puppet_group # Not applicable when ssl is false. # -# $manage_foreman_proxy_group:: Whether to manage foreman-proxy group creation. +# $manage_foreman_proxy_group:: Whether to set foreman-proxy group as a system group with lower GID. # # $puppet:: Enable Puppet module for environment imports and Puppet runs #