diff options
author | Micah <micah@riseup.net> | 2016-05-17 14:25:27 +0000 |
---|---|---|
committer | Micah <micah@riseup.net> | 2016-05-17 14:25:27 +0000 |
commit | 5268a87c329f895017f8ea6c6abc377a4f9a6a77 (patch) | |
tree | 7592ee5d07f5d0e93a40d0432d6a195ecc9ccd0d /manifests/init.pp | |
parent | 497513547be79f9d3c8e96f1650ec43ee634b277 (diff) | |
parent | f68560e7adbbbfad43f3bfc44be4423af561b0f1 (diff) |
liniting main class, moving key() to seperate class
The removal of ` $configdir = '/etc/backup.d',` was because this parameter was specified twice in the main class.
See merge request !6
Diffstat (limited to 'manifests/init.pp')
-rw-r--r-- | manifests/init.pp | 55 |
1 files changed, 8 insertions, 47 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index b7d3522..e453e70 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,3 +1,4 @@ +# configure backupninja class backupninja ( $ensure_backupninja_version = 'installed', $ensure_rsync_version = 'installed', @@ -23,7 +24,6 @@ class backupninja ( $reportuser = undef, $reportdirectory = undef, $logfile = '/var/log/backupninja.log', - $configdir = '/etc/backup.d', $scriptdir = '/usr/share/backupninja', $libdir = '/usr/lib/backupninja', $usecolors = true, @@ -37,55 +37,16 @@ class backupninja ( # set up backupninja config directory file { $configdir: ensure => directory, - mode => 750, owner => 0, group => 0; - } - - define key( - $user = $name, - $createkey = false, - $keymanage = $backupninja::keymanage, - $keyowner = $backupninja::keyowner, - $keygroup = $backupninja::keygroup, - $keystore= $backupninja::keystore, - $keystorefspath = $backupninja::keystorefspath, - $keytype = $backupninja::keytype, - $keydest = $backupninja::keydest, - $keydestname = "id_${backupninja::keytype}" ) - { - - # generate the key - if $createkey == true { - if $keystorefspath == false { - err("need to define a destination directory for sshkey creation!") - } - $ssh_keys = ssh_keygen("${keystorefspath}/${keydestname}") - } - - # deploy/manage the key - if $keymanage == true { - $keydestfile = "${keydest}/${keydestname}" - ensure_resource('file', $keydest, { - 'ensure' => 'directory', - 'mode' => '0700', - 'owner' => $keyowner, - 'group' => $keygroup - }) - ensure_resource('file', $keydestfile, { - 'ensure' => 'present', - 'source' => "${keystore}/${user}_id_${keytype}", - 'mode' => '0700', - 'owner' => $keyowner, - 'group' => $keygroup, - 'require' => File["$keydest"], - }) - } + mode => '0750', + owner => 0, + group => 0; } - file { $configfile: + file { $configfile: content => template('backupninja/backupninja.conf.erb'), - owner => root, - group => 0, - mode => '0644' + owner => root, + group => 0, + mode => '0644' } } |