aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2015-04-17 14:46:49 -0400
committerJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2015-04-17 17:12:16 -0400
commitd18c3e038a1018a86b6cd94b7076cd8bc7163271 (patch)
treebf89a9719992b1536a75a22399291d0b0802a928 /manifests
parent87ddb3e4260b47f0fc99f84d1818145af5be3e36 (diff)
downloadpuppet-backupninja-d18c3e038a1018a86b6cd94b7076cd8bc7163271.tar.gz
puppet-backupninja-d18c3e038a1018a86b6cd94b7076cd8bc7163271.tar.bz2
Rename backupninja::client class to backupninja
Diffstat (limited to 'manifests')
-rw-r--r--manifests/duplicity.pp4
-rw-r--r--manifests/init.pp (renamed from manifests/client.pp)2
-rw-r--r--manifests/maildir.pp2
-rw-r--r--manifests/rdiff.pp4
-rw-r--r--manifests/rsync.pp4
-rw-r--r--manifests/sys.pp4
6 files changed, 10 insertions, 10 deletions
diff --git a/manifests/duplicity.pp b/manifests/duplicity.pp
index 8c48793..058945d 100644
--- 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
index 9252dc6..9faba5d 100644
--- 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 c39dcf2..2454b82 100644
--- 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 8f349e6..6a602ea 100644
--- 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 0f730a0..160fad7 100644
--- 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 6fca2f0..946a525 100644
--- 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: {}
}