From a753ec0264964dc3b2362e5f5de70b7153acf7dd Mon Sep 17 00:00:00 2001 From: Elliot Schleglemilch Date: Sun, 14 Jul 2024 02:46:08 +0000 Subject: [PATCH] remove 'root' group and replace with 0, for use with wheel/root/whatever. 21:38 < bastelfreak> you can make group => 0 --- manifests/hook.pp | 2 +- manifests/plugin/dns_cloudflare.pp | 2 +- manifests/plugin/dns_rfc2136.pp | 2 +- manifests/renew.pp | 2 +- manifests/scripts.pp | 2 +- spec/classes/letsencrypt_spec.rb | 2 +- spec/classes/plugin/dns_rfc2136_spec.rb | 2 +- spec/defines/letsencrypt_certonly_spec.rb | 2 +- spec/defines/letsencrypt_hook_spec.rb | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manifests/hook.pp b/manifests/hook.pp index aa2ee2b2..181d408a 100644 --- a/manifests/hook.pp +++ b/manifests/hook.pp @@ -20,7 +20,7 @@ file { $hook_file: ensure => file, owner => 'root', - group => 'root', + group => 0, mode => '0755', content => epp('letsencrypt/hook.sh.epp', { commands => $commands, diff --git a/manifests/plugin/dns_cloudflare.pp b/manifests/plugin/dns_cloudflare.pp index a35d982c..2db15f85 100644 --- a/manifests/plugin/dns_cloudflare.pp +++ b/manifests/plugin/dns_cloudflare.pp @@ -65,7 +65,7 @@ file { $config_path: ensure => file, owner => 'root', - group => 'root', + group => 0, mode => '0400', content => epp('letsencrypt/ini.epp', { vars => { '' => $ini_vars }, diff --git a/manifests/plugin/dns_rfc2136.pp b/manifests/plugin/dns_rfc2136.pp index 094c8f5b..68c23e84 100644 --- a/manifests/plugin/dns_rfc2136.pp +++ b/manifests/plugin/dns_rfc2136.pp @@ -43,7 +43,7 @@ file { "${config_dir}/dns-rfc2136.ini": ensure => file, owner => 'root', - group => 'root', + group => 0, mode => '0400', content => epp('letsencrypt/ini.epp', { vars => { '' => $ini_vars }, diff --git a/manifests/renew.pp b/manifests/renew.pp index 471caba6..2c8bdafa 100644 --- a/manifests/renew.pp +++ b/manifests/renew.pp @@ -48,7 +48,7 @@ ensure => directory, path => "${letsencrypt::config_dir}/renewal-hooks-puppet", owner => 'root', - group => 'root', + group => 0, mode => '0755', recurse => true, purge => true, diff --git a/manifests/scripts.pp b/manifests/scripts.pp index 1fb5ddba..05411286 100644 --- a/manifests/scripts.pp +++ b/manifests/scripts.pp @@ -9,7 +9,7 @@ file { '/usr/local/sbin/letsencrypt-domain-validation': ensure => file, owner => 'root', - group => 'root', + group => 0, mode => '0500', content => file("${module_name}/domain-validation.sh"), } diff --git a/spec/classes/letsencrypt_spec.rb b/spec/classes/letsencrypt_spec.rb index b04cbe4d..1abe1252 100644 --- a/spec/classes/letsencrypt_spec.rb +++ b/spec/classes/letsencrypt_spec.rb @@ -40,7 +40,7 @@ with(ensure: 'directory', path: '/usr/local/etc/letsencrypt/renewal-hooks-puppet', owner: 'root', - group: 'root', + group: 0, mode: '0755', recurse: true, purge: true) diff --git a/spec/classes/plugin/dns_rfc2136_spec.rb b/spec/classes/plugin/dns_rfc2136_spec.rb index db06b8f4..700c056b 100644 --- a/spec/classes/plugin/dns_rfc2136_spec.rb +++ b/spec/classes/plugin/dns_rfc2136_spec.rb @@ -55,7 +55,7 @@ class { 'letsencrypt': is_expected.to contain_file("#{pathprefix}/etc/letsencrypt/dns-rfc2136.ini"). with_ensure('file'). with_owner('root'). - with_group('root'). + with_group('0'). with_mode('0400'). with_content(%r{^.*dns_rfc2136_server.*$}) end diff --git a/spec/defines/letsencrypt_certonly_spec.rb b/spec/defines/letsencrypt_certonly_spec.rb index 6e85d130..26c5ee77 100644 --- a/spec/defines/letsencrypt_certonly_spec.rb +++ b/spec/defines/letsencrypt_certonly_spec.rb @@ -27,7 +27,7 @@ is_expected.to contain_file('/usr/local/sbin/letsencrypt-domain-validation'). with_ensure('file'). with_owner('root'). - with_group('root'). + with_group('0'). with_mode('0500'). with_content(%r{#!/bin/sh}) end diff --git a/spec/defines/letsencrypt_hook_spec.rb b/spec/defines/letsencrypt_hook_spec.rb index 6560f9b4..f82fda88 100644 --- a/spec/defines/letsencrypt_hook_spec.rb +++ b/spec/defines/letsencrypt_hook_spec.rb @@ -33,7 +33,7 @@ is_expected.to contain_file('/etc/letsencrypt/renewal-hooks-puppet/foo.example.com-pre.sh'). with(ensure: 'file', owner: 'root', - group: 'root', + group: 0, mode: '0755', content: %r{^.*validate_env=0.*FooBar.*$}m). that_requires('File[letsencrypt-renewal-hooks-puppet]')