Rename backupninja::client class to backupninja

diff --git a/manifests/duplicity.pp b/manifests/duplicity.pp
index 8c48793f85bc5f3d6964058c3d53d7e881a5b21b..058945d30cea779cdbe3c6a28f85234bd23d2a48 100644 (file)
--- a/manifests/duplicity.pp
+++ b/manifests/duplicity.pp
@@ -97,7 +97,7 @@ define backupninja::duplicity( $order  = 90,
                                $installkey           = true ) {
 
   # install client dependencies
-  ensure_resource('package', 'duplicity', {'ensure' => $backupninja::client::ensure_duplicity_version})
+  ensure_resource('package', 'duplicity', {'ensure' => $backupninja::ensure_duplicity_version})
 
   case $desthost { false: { err("need to define a destination host for remote backups!") } }
   case $destdir { false: { err("need to define a destination directory for remote backups!") } }
@@ -118,7 +118,7 @@ define backupninja::duplicity( $order  = 90,
   }
 
   # the client's ssh key
-  backupninja::client::key { "${destuser}-${name}":
+  backupninja::key { "${destuser}-${name}":
     user           => $destuser,
     host           => $desthost,
     createkey      => $createkey,

diff --git a/manifests/client.pp b/manifests/init.pp
similarity index 98%
rename from manifests/client.pp
rename to manifests/init.pp
index 9252dc6e1b94ae3f149c4d9715f7a285bed8b834..9faba5d981a6c44da44ad502045f74d5f4b90b5e 100644 (file)
--- a/manifests/client.pp
+++ b/manifests/init.pp
@@ -1,4 +1,4 @@
-class backupninja::client (
+class backupninja (
   $ensure_backupninja_version = 'installed',
   $ensure_rsync_version = 'installed',
   $ensure_rdiffbackup_version = 'installed',

diff --git a/manifests/maildir.pp b/manifests/maildir.pp
index c39dcf24a0c40e45c98ea2fdac3379dfd3b9bda5..2454b82da0263909c704f87f5b6289daeae8231f 100644 (file)
--- a/manifests/maildir.pp
+++ b/manifests/maildir.pp
@@ -24,7 +24,7 @@ define backupninja::maildir(
   $keepmonthly='2')
 {
   # install client dependencies
-  ensure_resource('package', 'rsync', {'ensure' => $backupninja::client::ensure_rsync_version})
+  ensure_resource('package', 'rsync', {'ensure' => $backupninja::ensure_rsync_version})
 
   case $srcdir { false: { err("need to define a source directory to backup!") } }
   case $destdir { false: { err("need to define a destination directory to backup!") } }

diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index 8f349e6902fb5f51de91f74bc8d81de2515e9233..6a602ea6cb6de044036750af9f1a89f3b179e0f3 100644 (file)
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -30,7 +30,7 @@ define backupninja::rdiff(
   $extras = false, $nagios_description = 'backups')
 {
   # install client dependencies
-  ensure_resource('package', 'rdiff-backup', {'ensure' => $backupninja::client::ensure_rdiffbackup_version})
+  ensure_resource('package', 'rdiff-backup', {'ensure' => $backupninja::ensure_rdiffbackup_version})
 
   $directory = "$home/rdiff-backup/"
 
@@ -51,7 +51,7 @@ define backupninja::rdiff(
         nagios_description => $nagios_description
       }
      
-      backupninja::client::key
+      backupninja::key
       {
         "${user}-${name}": user => $user, host => $host,
         installkey => $installkey,

diff --git a/manifests/rsync.pp b/manifests/rsync.pp
index 0f730a0de6b6b10677d412e95708425b8c14d9cb..160fad7e794d36d9287bf8af5a949335c70d79db 100644 (file)
--- a/manifests/rsync.pp
+++ b/manifests/rsync.pp
@@ -31,7 +31,7 @@ define backupninja::rsync(
   $rm = false, $cp = false, $touch = false, $mv = false, $fsck = false)
 {
   # install client dependencies
-  ensure_resource('package', 'rsync', {'ensure' => $backupninja::client::ensure_rsync_version})
+  ensure_resource('package', 'rsync', {'ensure' => $backupninja::ensure_rsync_version})
 
   # Right now just local origin with remote destination is supported.
   $from = 'local'
@@ -68,7 +68,7 @@ define backupninja::rsync(
         nagios_description  => $nagios_description
       }
      
-      backupninja::client::key { "${user}-${name}":
+      backupninja::key { "${user}-${name}":
         user       => $user,
         host       => $host,
         installkey => $installkey,

diff --git a/manifests/sys.pp b/manifests/sys.pp
index 6fca2f0301785caf239b6d9ccd0f8df878ab75ff..946a525ec5e37fa6083b7ecd3aa7a6c1cc7b5be9 100644 (file)
--- a/manifests/sys.pp
+++ b/manifests/sys.pp
@@ -28,8 +28,8 @@ define backupninja::sys($order = 30,
   # install client dependencies
   case $operatingsystem {
     debian,ubuntu: {
-      ensure_resource('package', 'debconf-utils', {'ensure' => $backupninja::client::ensure_debconfutils_version})
-      ensure_resource('package', 'hwinfo', {'ensure' => $backupninja::client::ensure_hwinfo_version})
+      ensure_resource('package', 'debconf-utils', {'ensure' => $backupninja::ensure_debconfutils_version})
+      ensure_resource('package', 'hwinfo', {'ensure' => $backupninja::ensure_hwinfo_version})
     }
     default: {}
   }