Align purge and recurse

Added `recurse => true` to all `file` resources where `purge => true` was set so that it actually takes effect as intended. Closes #66
simp · Sep 17, 2022 · 2c53622 · 2c53622
1 parent 2c48af3
commit 2c53622
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 23 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+* Sat Sep 17 2022 Trevor Vaughan <trevor@sicura.us> - 8.2.1
+- Added `purge => true` where `recurse => true` was present
+
 * Tue Jun 15 2021 Chris Tessmer <chris.tessmer@onyxpoint.com> - 8.2.0
 - Removed support for Puppet 5
 - Ensured support for Puppet 7 in requirements and stdlib

diff --git a/manifests/v3/conf/instantiate.pp b/manifests/v3/conf/instantiate.pp
@@ -20,12 +20,13 @@
 
   ensure_resource ('file',  "${freeradius::confdir}/conf.d",
     {
-      ensure => 'directory',
-      owner  => 'root',
-      group  => $freeradius::group,
-      mode   => '0640',
-      purge  => true,
-      before => Service['radiusd'],
+      ensure  => 'directory',
+      owner   => 'root',
+      group   => $freeradius::group,
+      mode    => '0640',
+      recurse => true,
+      purge   => true,
+      before  => Service['radiusd'],
     })
 
   file { "${freeradius::confdir}/conf.d/instantiate.inc":

diff --git a/manifests/v3/conf/security.pp b/manifests/v3/conf/security.pp
@@ -42,12 +42,13 @@
 
   ensure_resource ('file',  "${freeradius::confdir}/conf.d",
     {
-      ensure => 'directory',
-      owner  => 'root',
-      group  => $freeradius::group,
-      mode   => '0640',
-      purge  => true,
-      before => Service['radiusd'],
+      ensure  => 'directory',
+      owner   => 'root',
+      group   => $freeradius::group,
+      mode    => '0640',
+      purge   => true,
+      recurse => true,
+      before  => Service['radiusd'],
     })
 
   file { "${freeradius::confdir}/conf.d/security.inc":

diff --git a/manifests/v3/conf/thread_pool.pp b/manifests/v3/conf/thread_pool.pp
@@ -27,12 +27,13 @@
 
   ensure_resource ('file',  "${freeradius::confdir}/conf.d",
     {
-      ensure => 'directory',
-      owner  => 'root',
-      group =>  $freeradius::group,
-      mode   => '0640',
-      purge  => true,
-      before => Service['radiusd'],
+      ensure  => 'directory',
+      owner   => 'root',
+      group   => $freeradius::group,
+      mode    => '0640',
+      purge   => true,
+      recurse => true,
+      before  => Service['radiusd'],
     })
 
   file { "${freeradius::confdir}/conf.d/thread_pool.inc":

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "simp-freeradius",
-  "version": "8.2.0",
+  "version": "8.2.1",
   "author": "SIMP Team",
   "summary": "manages FreeRADIUS authentication servers",
   "license": "Apache-2.0",

diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml
@@ -37,22 +37,21 @@ HOSTS:
       - server
       - client
     platform: el-8-x86_64
-    box: generic/centos8
+    box: centos/stream8
     hypervisor: <%= hypervisor %>
 
   el8-ldap:
     roles:
       - 389ds
       - client
     platform: el-8-x86_64
-    box: generic/centos8
+    box: centos/stream8
     hypervisor: <%= hypervisor %>
 
 CONFIG:
   log_level: verbose
   synced_folder : disabled
   type: aio
-  vagrant_memsize: 256
 <% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
   puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
 <% end -%>
diff --git a/spec/acceptance/nodesets/oel.yml b/spec/acceptance/nodesets/oel.yml
@@ -59,7 +59,6 @@ CONFIG:
   log_level: verbose
   synced_folder : disabled
   type: aio
-  vagrant_memsize: 256
 <% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
   puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
 <% end -%>