From b5e02d6fe88dd074f4c04f32dff9f39c43ef5208 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Mon, 5 Jun 2017 19:02:45 -0300 Subject: Changes for puppet 4 compatibility --- manifests/duplicity.pp | 2 +- manifests/init.pp | 2 +- manifests/labelmount.pp | 8 ++++---- manifests/maildir.pp | 2 +- manifests/mysql.pp | 2 +- manifests/pgsql.pp | 2 +- manifests/rdiff.pp | 2 +- manifests/rsync.pp | 2 +- manifests/sandbox.pp | 6 +++--- manifests/server.pp | 4 ++-- manifests/sh.pp | 2 +- manifests/svn.pp | 2 +- manifests/sys.pp | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) (limited to 'manifests') diff --git a/manifests/duplicity.pp b/manifests/duplicity.pp index bb70045..8c5f5de 100644 --- 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 ed79f51..89220e7 100644 --- 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 8974cec..bc25f0c 100644 --- 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 2454b82..96d4783 100644 --- 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 b8877c0..b7be474 100644 --- 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 d4814be..8fe5f07 100644 --- 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 294ec78..d0c6d7f 100644 --- 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 56d37dd..c760e4d 100644 --- 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 4446b67..102f228 100644 --- 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 3a8761e..873d2e5 100644 --- 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 4a60e5f..266f60e 100644 --- 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 1ab0597..acac22b 100644 --- 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 946a525..6916f27 100644 --- 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}"] } } -- cgit v1.2.3