Changes for puppet 4 compatibility

diff --git a/manifests/duplicity.pp b/manifests/duplicity.pp
index 2da5db18d81228e8825babe5a5e504f2523806f7..e84e05051df677fa44eaca3882233c1c5c43d3c3 100644 (file)
--- a/manifests/duplicity.pp
+++ b/manifests/duplicity.pp
@@ -35,7 +35,7 @@ define backup::duplicity(
     content => template('backup/duplicity.conf.erb'),
     owner   => root,
     group   => root,
-    mode    => 0600,
+    mode    => '0600',
     require => File["${backupninja::configdir}"],
   }
 

diff --git a/manifests/init.pp b/manifests/init.pp
index e272b5656565d44c1d777b1000a9bc52d2856136..421800f3f238e4f539f746248361f3006d714494 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -60,21 +60,21 @@ class backup(
     ensure => directory,
     owner  => root,
     group  => root,
-    mode   => 0755,
+    mode   => '0755',
   }
 
   file { "/var/log/backup":
     ensure => directory,
     owner  => root,
     group  => root,
-    mode   => 0755,
+    mode   => '0755',
   }
 
   file { "/etc/logrotate.d/backup":
     ensure => present,
     owner  => root,
     group  => root,
-    mode   => 0644,
+    mode   => '0644',
     source => "puppet:///modules/backup/logrotate.d/backup",
   }
 
@@ -83,7 +83,7 @@ class backup(
     content => template('backup/rdiff-check.sh.erb'),
     owner   => root,
     group   => root,
-    mode    => 0755,
+    mode    => '0755',
     ensure  => present,
   }
 
@@ -103,7 +103,7 @@ class backup(
     content => template('backup/rsync-check.sh.erb'),
     owner   => root,
     group   => root,
-    mode    => 0755,
+    mode    => '0755',
     ensure  => present,
   }
 
@@ -127,7 +127,7 @@ class backup(
     ensure  => present,
     owner   => "root",
     group   => "root",
-    mode    => 0644,
+    mode    => '0644',
     source  => "puppet:///modules/backup/handlers/rsync",
     require => Package['backupninja'],
   }
@@ -137,7 +137,7 @@ class backup(
   file { "/usr/local/sbin/sync-backups":
     owner   => root,
     group   => root,
-    mode    => 0755,
+    mode    => '0755',
     ensure  => absent,
   }
 
@@ -146,7 +146,7 @@ class backup(
   file { "/usr/local/sbin/sync-media":
     owner   => root,
     group   => root,
-    mode    => 0755,
+    mode    => '0755',
     ensure  => absent,
   }
 
@@ -155,7 +155,7 @@ class backup(
   file { "/usr/local/sbin/sync-media-export":
     owner   => root,
     group   => root,
-    mode    => 0755,
+    mode    => '0755',
     ensure  => absent,
   }
 
@@ -164,7 +164,7 @@ class backup(
   file { "/usr/local/sbin/sync-media-init":
     owner   => root,
     group   => root,
-    mode    => 0755,
+    mode    => '0755',
     ensure  => absent,
   }
 
@@ -173,7 +173,7 @@ class backup(
   file { "/usr/local/sbin/sync-media-initremotes":
     owner   => root,
     group   => root,
-    mode    => 0755,
+    mode    => '0755',
     ensure  => absent,
   }
 
@@ -182,7 +182,7 @@ class backup(
   file { "/usr/local/sbin/mount-media":
     owner   => root,
     group   => root,
-    mode    => 0755,
+    mode    => '0755',
     ensure  => absent,
   }
 

diff --git a/templates/duplicity.conf.erb b/templates/duplicity.conf.erb
index 3f2cf9e8a0ac4e9d2e483b01fc07dc5b69c15c25..846f9dede2d8ad96c7905b9db29d5dba749f3a09 100644 (file)
--- a/templates/duplicity.conf.erb
+++ b/templates/duplicity.conf.erb
@@ -29,10 +29,10 @@ mkdir -p $BACKUP_FOLDER
 
 # adds support for checking the existing backup
 if [ "$1" == "--check" ]; then
-  duplicity collection-status file:///$BACKUP_FOLDER
+  duplicity collection-status file:////$BACKUP_FOLDER
 else
   # cleanup any previous broken backups
-  duplicity cleanup file:///$BACKUP_FOLDER --force
+  duplicity cleanup file:////$BACKUP_FOLDER --force
 
   # remove dangling lockfiles
   if [ -z "`pidof duplicity`" ]; then
@@ -43,14 +43,14 @@ else
   # have greater precedence; see duplicity(1) for more info
   duplicity -v6 --full-if-older-than $FULL_IF_OLDER_THAN                    \
             --tempdir $TMP --encrypt-key $ENCRYPT_KEY --sign-key $SIGN_KEY  \
-            --exclude $TMP $EXCLUDE $INCLUDE --exclude '**' / file:///$BACKUP_FOLDER
+            --exclude $TMP $EXCLUDE $INCLUDE --exclude '**' / file:////$BACKUP_FOLDER
 
   if [ "$?" != "0" ]; then
     fatal "Duplicity backup failed."
   fi
 
-  duplicity remove-older-than $REMOVE_OLDER_THAN file:///$BACKUP_FOLDER --force || exit 1
-  duplicity remove-all-but-n-full $REMOVE_ALL_BUT_N_FULL file:///$BACKUP_FOLDER --force || exit 1
+  duplicity remove-older-than $REMOVE_OLDER_THAN file:////$BACKUP_FOLDER --force || exit 1
+  duplicity remove-all-but-n-full $REMOVE_ALL_BUT_N_FULL file:////$BACKUP_FOLDER --force || exit 1
 
   if [ "$?" != "0" ]; then
     fatal "Removal of old backups failed."