Merge backupninja:config class into base client class

diff --git a/manifests/init.pp b/manifests/init.pp
index 9faba5d981a6c44da44ad502045f74d5f4b90b5e..17f83dfd89b2f6dd36aee4981d238a549cc74f83 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -13,6 +13,21 @@ class backupninja (
   $keyowner = 0,
   $keygroup = 0,
   $keymanage = true,
+  $configfile = '/etc/backupninja.conf',
+  $loglvl = 4,
+  $when = 'everyday at 01:00',
+  $reportemail = 'root',
+  $reportsuccess = false,
+  $reportwarning = true,
+  $reporthost = undef,
+  $reportuser = undef,
+  $reportdirectory = undef,
+  $logfile = '/var/log/backupninja.log',
+  $configdir = '/etc/backup.d',
+  $scriptdir = '/usr/share/backupninja',
+  $libdir = '/usr/lib/backupninja',
+  $usecolors = true,
+  $vservers = false
 ) {
 
   # install client dependencies
@@ -65,4 +80,11 @@ class backupninja (
     }
   }
 
+ file { $configfile:
+    content => template('backupninja/backupninja.conf.erb'),
+    owner => root,
+    group => 0,
+    mode => '0644'
+  }
+
 }

diff --git a/templates/backupninja.conf.erb b/templates/backupninja.conf.erb
index abc7c29915244dd59cdcf0fcfae5e9c36c4a0418..fe7affa3db2ff164490c823251b0dad855a951dd 100644 (file)
--- a/templates/backupninja.conf.erb
+++ b/templates/backupninja.conf.erb
@@ -8,14 +8,14 @@ when = <%= send(:when) %>
 reportemail = <%= reportemail %>
 reportsuccess = <%= reportsuccess ? 'yes' : 'no' %>
 reportwarning = <%= reportwarning ? 'yes' : 'no' %>
-<% if reporthost.is_a? String -%>
-<%= 'reporthost = ' + reporthost %>
+<% if @reporthost -%>
+<%= 'reporthost = ' + @reporthost %>
 <% end -%>
-<% if reportuser.is_a? String -%>
-<%= 'reportuser = ' + reportuser %>
+<% if @reportuser -%>
+<%= 'reportuser = ' + @reportuser %>
 <% end -%>
-<% if reportdirectory.is_a? String -%>
-<%= 'reportdirectory = ' + reportdirectory %>
+<% if @reportdirectory -%>
+<%= 'reportdirectory = ' + @reportdirectory %>
 <% end -%>
 logfile = <%= logfile %>
 configdirectory = <%= configdir %>