diff options
author | Micah Anderson <micah@riseup.net> | 2008-05-30 17:43:51 +0000 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2008-05-30 17:43:51 +0000 |
commit | 100bb69f2e721332e71e4e5bf8dd96cf3499296c (patch) | |
tree | 26e540ec4786e0c033f56c44294a9a3977cc014b /manifests/server.pp | |
parent | d08410db8a81ce6060eea2044c0ac09c001568ab (diff) | |
download | puppet-backupninja-100bb69f2e721332e71e4e5bf8dd96cf3499296c.tar.gz puppet-backupninja-100bb69f2e721332e71e4e5bf8dd96cf3499296c.tar.bz2 |
change the backupninja::client::key definition to use the $user variable
change the $host variable to no longer use the $user variable, that way
multiple rdiff's can be instantiated for a particular host, with different
name variables
in order to do that, the class also has to have the $installkeys variable that
can be passed to backupninja::client::key so that the second rdiff instantiation would
set installkeys => false, otherwise there will be an attempt to duplicate the resource
Diffstat (limited to 'manifests/server.pp')
-rw-r--r-- | manifests/server.pp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/manifests/server.pp b/manifests/server.pp index dbeeca0..3952ae3 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -40,26 +40,26 @@ class backupninja::server { } @@file { "$real_dir": ensure => directory, - mode => 750, owner => $name, group => 0, + mode => 750, owner => $user, group => 0, tag => "backupninja-$real_host", } @@file { "$real_dir/.ssh": ensure => directory, - mode => 700, owner => $name, group => 0, + mode => 700, owner => $user, group => 0, require => File["$real_dir"], tag => "backupninja-$real_host", } @@file { "$real_dir/.ssh/authorized_keys": ensure => present, mode => 644, owner => 0, group => 0, - source => "$real_backupkeys/${name}_id_rsa.pub", + source => "$real_backupkeys/${user}_id_rsa.pub", require => File["$real_dir/.ssh"], tag => "backupninja-$real_host", } case $uid { false: { - @@user { "$name": + @@user { "$user": ensure => "present", gid => "$gid", comment => "$name backup sandbox", @@ -72,7 +72,7 @@ class backupninja::server { } } default: { - @@user { "$name": + @@user { "$user": ensure => "present", uid => "$uid", gid => "$gid", |