Add option to avoid overwriting OS configuration

seekingalpha · Mar 15, 2016 · 5b4e908 · 5b4e908
1 parent 1ad0c2e
commit 5b4e908
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -154,6 +154,14 @@ class { '::logrotate':
 }
 ```
 
+To avoid overwriting the OS-provided main configuration file, set `config` to `false`.
+
+```puppet
+class { '::logrotate':
+  config => false,
+}
+```
+
 
 ## Examples
 

diff --git a/manifests/config.pp b/manifests/config.pp
@@ -21,9 +21,12 @@
     }
   }
 
-  if is_hash($config) {
-    $custom_config = {'/etc/logrotate.conf' => $config}
-    create_resources('logrotate::conf', $custom_config)
+  if $config {
+    if is_hash($config) {
+      $custom_config = {'/etc/logrotate.conf' => $config}
+      create_resources('logrotate::conf', $custom_config)
+    }
+    include ::logrotate::defaults
   }
 
-}
+}
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -5,18 +5,16 @@
   $manage_cron_daily = true,
   $package           = 'logrotate',
   $rules             = {},
-  $config            = undef,
+  $config            = true,
 ) {
 
   include ::logrotate::install
   include ::logrotate::config
-  include ::logrotate::defaults
   include ::logrotate::rules
 
   anchor{'logrotate_begin':}->
   Class['::logrotate::install']->
   Class['::logrotate::config']->
-  Class['::logrotate::defaults']->
   Class['::logrotate::rules']->
   anchor{'logrotate_end':}