NEW: implemented local backup filebucket cleanup

andvgal · andvgal · commit 8d2d43f5c92c · 2019-04-16T23:15:23.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@ project adheres to [Semantic Versioning](http://semver.org/).
 
 ## (next)
 - NEW: allow borrowing insufficient memory from swap for distribution
+- NEW: implemented local backup filebucket cleanup
 
 ## 1.3.0 (2019-04-14)
 - FIXED: forced secrets to override persistent values
diff --git a/README.md b/README.md
@@ -161,6 +161,7 @@ cfnetwork::client_ports:
 * `$key_server = 'hkp://pgp.mit.edu:80'` - default PGP key server
 * `$random_feed = true` - enable random entropy generating daemon
 * `$add_handy_tools = true` - install additional tools
+* `$puppet_backup_age = '1d'` - how long to keep local puppet filebucket backups
 
 ## `cfsystem::bindir` type
 
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -66,6 +66,8 @@
 
     Boolean $random_feed = true,
     Boolean $add_handy_tools = true,
+
+    String[1] $puppet_backup_age = '1d',
 ) inherits cfsystem::defaults {
     include cfnetwork
     include cfauth
@@ -203,6 +205,14 @@
         }
     }
 
+    # Cleanup local backups
+    tidy { '/opt/puppetlabs/puppet/cache/clientbucket/':
+        age     => $puppet_backup_age,
+        recurse => true,
+        rmdirs  => true,
+        backup  => false,
+    }
+
     #---
     exec { 'cfsystem-systemd-reload':
         command     => '/bin/systemctl daemon-reload',
