Merge branch 'master' into ortiche

manifests/base.pp

@@ -25,21 +25,9 @@ class sshd::base {
   case $::sshrsakey {
     '': { info("no sshrsakey on ${::fqdn}") }
     default: {
-      @@sshkey{$::fqdn:
+      # only export sshkey when storedconfigs is enabled
-        ensure => present,
+      if $::sshd::use_storedconfigs {
-        tag    => 'fqdn',
+        include ::sshd::sshkey
-        type   => ssh-rsa,
-        key    => $::sshrsakey,
-      }
-      # In case the node has uses a shared network address,
-      # we don't define a sshkey resource using an IP address
-      if $sshd::shared_ip == 'no' {
-        @@sshkey{$sshd::sshkey_ipaddress:
-          ensure => present,
-          tag    => 'ipaddress',
-          type   => ssh-rsa,
-          key    => $::sshrsakey,
-        }
       }
     }
   }

manifests/init.pp

@@ -52,7 +52,8 @@ class sshd(
   $hostkey_type = versioncmp($::ssh_version, '6.5') ? {
     /(1|0)/ => [ 'rsa', 'ed25519' ],
     /-1/    => [ 'rsa', 'dsa' ]
-  }
+  },
+  $use_storedconfigs = true
 ) {
 
   validate_bool($manage_shorewall)

manifests/sshkey.pp

@@ -0,0 +1,21 @@
+# deploys the
+class sshd::sshkey {
+
+  @@sshkey{$::fqdn:
+    ensure => present,
+    tag    => 'fqdn',
+    type   => 'ssh-rsa',
+    key    => $::sshrsakey,
+  }
+
+  # In case the node has uses a shared network address,
+  # we don't define a sshkey resource using an IP address
+  if $sshd::shared_ip == 'no' {
+    @@sshkey{$::sshd::sshkey_ipaddress:
+      ensure => present,
+      tag    => 'ipaddress',
+      type   => 'ssh-rsa',
+      key    => $::sshrsakey,
+    }
+  }
+}

templates/sshd_config/Ubuntu_quantal.erb

@@ -0,0 +1 @@
+Ubuntu.erb

templates/sshd_config/Ubuntu_raring.erb

@@ -0,0 +1 @@
+Ubuntu.erb

templates/sshd_config/Ubuntu_saucy.erb

@@ -0,0 +1 @@
+Ubuntu.erb

templates/sshd_config/Ubuntu_trusty.erb

@@ -0,0 +1 @@
+Ubuntu.erb

templates/sshd_config/Ubuntu_utopic.erb

@@ -0,0 +1 @@
+Ubuntu.erb

templates/sshd_config/Ubuntu_vivid.erb

@@ -0,0 +1 @@
+Ubuntu.erb

templates/sshd_config/Ubuntu_wily.erb

@@ -0,0 +1 @@
+Ubuntu.erb

templates/sshd_config/Ubuntu_xenial.erb

@@ -0,0 +1 @@
+Ubuntu.erb