Merge branch 'lint_main_class' into 'master' HEADmaster

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

2 files changed, 49 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'
   }
 
 }
diff --git a/manifests/key.pp b/manifests/key.pp
new file mode 100644
index 0000000..9d34cdb
--- /dev/null
+++ b/manifests/key.pp
@@ -0,0 +1,41 @@
+# generate and deploy backupninja sshkeys
+define backupninja::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],
+    })
+  }
+}