Merge branch 'master' of git://git.sarava.org/puppet-backupninja

Conflicts:
	manifests/client.pp
	manifests/rdiff.pp

diff --cc manifests/client.pp
Simple merge

diff --cc manifests/rdiff.pp
Simple merge

diff --cc manifests/server.pp
index 0b7ebb9bbec125928bee09df1f2c0e6e1e6310bb,6ed87c8b6fd74a55d112fdf582ba6a2c5ab0446a..f7020565fca76695f75020c699140b7d72d26d4c
--- 1/manifests/server.pp
--- 2/manifests/server.pp
+++ b/manifests/server.pp
@@@ -19,13 -30,21 +30,17 @@@ class backupninja::server 
    }
    
    file { "$real_backupdir":
-     ensure => "directory",
-     mode => 0710, owner => root, group => "backupninjas"
+     ensure => "$real_backupdir_ensure",
+     mode => 0710, owner => root, group => "backupninjas",
+     require => $real_backupdir_ensure ? {
+       'directory' => undef,
+       default     => File["$real_backupdir_ensure"],
+     }
    }
  
 -  if $nagios_server {
 +  if $use_nagios {
  
 -    if !defined(Package["nsca"]) {
 -      package { "nsca":
 -        ensure => installed;
 -      }
 -    }
 +    include nagios::nsca::client
      
      file { "/usr/local/bin/checkbackups":
        ensure => "present",
@@@ -96,11 -114,19 +110,19 @@@
        default => $nagios2_description,
      }
  
 -    if $nagios_server {
 +    if $use_nagios {
        # configure a passive service check for backups
 -      nagios2::passive_service { "backups-${name}": nagios2_host_name => $real_host, nagios2_description => $real_nagios2_description, servicegroups => "backups" }
 +      nagios::service::passive { $nagios2_description: }
      }
      
+     if !defined(Backupninja_server_realize["${fqdn}@${real_host}"]) {
+       # this defines just maps that $real_host host backups for $fdqn
+       @@backupninja_server_realize { "${fqdn}@${real_host}":
+         host => $fqdn,
+         tag  => $real_host,
+       }
+     }
+ 
      if !defined(File["$real_dir"]) {
        @@file { "$real_dir":
          ensure => directory,