Changes for puppet 4 compatibility

diff --git a/manifests/duplicity.pp b/manifests/duplicity.pp
index bb70045380d3489faa4b2488922b9a7135354bb5..8c5f5de1dc5f9b8df1154486bfd750b7b2070a7b 100644 (file)
--- a/manifests/duplicity.pp
+++ b/manifests/duplicity.pp
@@ -138,7 +138,7 @@ define backupninja::duplicity( $order  = 90,
     content => template('backupninja/dup.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 ed79f511f76dce4a9dd561e2639b53de0cbe02e5..89220e7818296e8808a53900ca45d3baed87f5ce 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -36,7 +36,7 @@ class backupninja (
   # set up backupninja config directory
   file { $configdir:
     ensure => directory,
-    mode => 750, owner => 0, group => 0;
+    mode => '0750', owner => 0, group => 0;
   }
 
   define key(

diff --git a/manifests/labelmount.pp b/manifests/labelmount.pp
index 8974cec1cd7ac874251282fd603e500aae209ae3..bc25f0cb99e3253a6b9a33dd4a2e7c0debb774f5 100644 (file)
--- a/manifests/labelmount.pp
+++ b/manifests/labelmount.pp
@@ -28,7 +28,7 @@ define backupninja::labelmount($order = 10,
                content => template('backupninja/labelmount.conf.erb'),
                owner => root,
                group => root,
-               mode => 0600,
+               mode => '0600',
                require => File["${backupninja::configdir}"]
        }
 
@@ -37,7 +37,7 @@ define backupninja::labelmount($order = 10,
                content => template('backupninja/umount.conf.erb'),
                owner => root,
                group => root,
-               mode => 0600,
+               mode => '0600',
                require => File["${backupninja::configdir}"]
        }
        
@@ -48,7 +48,7 @@ define backupninja::labelmount($order = 10,
                content => template('backupninja/labelmount.handler'),
                owner => root,
                group => root,
-               mode => 0755,
+               mode => '0755',
                require => Package[backupninja]
        }
 
@@ -56,7 +56,7 @@ define backupninja::labelmount($order = 10,
                content => template('backupninja/umount.handler'),
                owner => root,
                group => root,
-               mode => 0755,
+               mode => '0755',
                require => Package[backupninja]
        }
 }

diff --git a/manifests/maildir.pp b/manifests/maildir.pp
index 2454b82da0263909c704f87f5b6289daeae8231f..96d4783e03dd82dee56aad3f874435f5c0fab940 100644 (file)
--- a/manifests/maildir.pp
+++ b/manifests/maildir.pp
@@ -37,7 +37,7 @@ define backupninja::maildir(
     content => template('backupninja/maildir.conf.erb'),
     owner => root,
     group => root,
-    mode => 0600,
+    mode => '0600',
     require => File["${backupninja::configdir}"]
   }
 }

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

diff --git a/manifests/pgsql.pp b/manifests/pgsql.pp
index d4814be9963ffa4309e76d3628e7640cf4e3d056..8fe5f07e6f4e08465937853b170548f052f6a6d3 100644 (file)
--- a/manifests/pgsql.pp
+++ b/manifests/pgsql.pp
@@ -21,7 +21,7 @@ define backupninja::pgsql(
     content => template('backupninja/pgsql.conf.erb'),
     owner => root,
     group => root,
-    mode => 0600,
+    mode => '0600',
     require => File["${backupninja::configdir}"]
   }
 }

diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index 294ec78b0f0f357ef18e18eadcb2a81eeef035ef..d0c6d7f5c17fb20fd31b3ecc7702476be123273a 100644 (file)
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -100,7 +100,7 @@ define backupninja::rdiff( $order  = 90,
     content => template('backupninja/rdiff.conf.erb'),
     owner   => root,
     group   => root,
-    mode    => 0600,
+    mode    => '0600',
     require => File["${backupninja::configdir}"]
   }
 

diff --git a/manifests/rsync.pp b/manifests/rsync.pp
index 56d37dd1d69c8392a2616d072cda04b74cd07639..c760e4daa9b8befa43c22157819a35953e17d106 100644 (file)
--- a/manifests/rsync.pp
+++ b/manifests/rsync.pp
@@ -119,7 +119,7 @@ define backupninja::rsync( $order  = 90,
     content => template('backupninja/rsync.conf.erb'),
     owner   => root,
     group   => root,
-    mode    => 0600,
+    mode    => '0600',
     require => File["${backupninja::configdir}"]
   }
 

diff --git a/manifests/sandbox.pp b/manifests/sandbox.pp
index 4446b67911958d108f3b64c7cac6d5c7af656b9e..102f2282ce74d4bd54d6bf81c928867526a0b4dd 100644 (file)
--- a/manifests/sandbox.pp
+++ b/manifests/sandbox.pp
@@ -26,7 +26,7 @@ define backupninja::sandbox (
   if !defined(File["$dir"]) {
     @@file { "$dir":
       ensure => directory,
-      mode   => 0750,
+      mode   => '0750',
       owner  => $user,
       group  => 0,
       tag    => "$backuptag",
@@ -39,7 +39,7 @@ define backupninja::sandbox (
       if !defined(File["$ssh_dir"]) {
         @@file { "${ssh_dir}":
           ensure  => directory,
-          mode    => 0700,
+          mode    => '0700',
           owner   => $user,
           group   => 0,
           require => [User[$user], File["$dir"]],
@@ -66,7 +66,7 @@ define backupninja::sandbox (
       if !defined(File["${ssh_dir}/${authorized_keys_file}"]) {
         @@file { "${ssh_dir}/${authorized_keys_file}":
           ensure  => present,
-          mode    => 0644,
+          mode    => '0644',
           owner   => 0,
           group   => 0,
           source  => "${backupkeys}/${user}_id_${keytype}.pub",

diff --git a/manifests/server.pp b/manifests/server.pp
index 3a8761e151cf8a59ea01bd3e1c8ede830aa46c2a..873d2e59246ea23557bca2f0bb076ce770a26e13 100644 (file)
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -15,7 +15,7 @@ class backupninja::server (
   
   file { $backupdir:
     ensure => $backupdir_ensure,
-    mode => 0710, owner => root, group => "backupninjas",
+    mode => '0710', owner => root, group => "backupninjas",
     require => $backupdir_ensure ? {
       'directory' => undef,
       default     => File["$backupdir_ensure"],
@@ -31,7 +31,7 @@ class backupninja::server (
     file { "/usr/local/bin/checkbackups":
       ensure => "present",
       source => "puppet:///modules/backupninja/checkbackups.pl",
-      mode => 0755, owner => root, group => root,
+      mode => '0755', owner => root, group => root,
     }
 
     cron { checkbackups:

diff --git a/manifests/sh.pp b/manifests/sh.pp
index 4a60e5fa04444e78f7829ea5a6359447b497c5b2..266f60ebbe552e84ab7e11efbe350c39075e24fc 100644 (file)
--- a/manifests/sh.pp
+++ b/manifests/sh.pp
@@ -19,7 +19,7 @@ define backupninja::sh($order = 50,
                content => template('backupninja/sh.conf.erb'),
                owner => root,
                group => root,
-               mode => 0600,
+               mode => '0600',
                require => File["${backupninja::configdir}"]
        }
 }

diff --git a/manifests/svn.pp b/manifests/svn.pp
index 1ab0597f94926d9767d66d7664406a1c171f1311..acac22b6910e4ed9ac2dd2e3a01b52a93e52a94e 100644 (file)
--- a/manifests/svn.pp
+++ b/manifests/svn.pp
@@ -22,7 +22,7 @@ define backupninja::svn($order = 20,
                content => template('backupninja/svn.conf.erb'),
                owner => root,
                group => root,
-               mode => 0600,
+               mode => '0600',
                require => File["${backupninja::configdir}"]
        }
 }

diff --git a/manifests/sys.pp b/manifests/sys.pp
index 946a525ec5e37fa6083b7ecd3aa7a6c1cc7b5be9..6916f27ba8648dd6cb945dd9db37c2cac7d2acf7 100644 (file)
--- a/manifests/sys.pp
+++ b/manifests/sys.pp
@@ -39,7 +39,7 @@ define backupninja::sys($order = 30,
                content => template('backupninja/sys.conf.erb'),
                owner => root,
                group => root,
-               mode => 0600,
+               mode => '0600',
                require => File["${backupninja::configdir}"]
        }
 }