summaryrefslogtreecommitdiff
path: root/puppet/modules/site_config
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2012-10-30 15:16:50 +0100
committervarac <varacanero@zeromail.org>2012-10-30 15:16:50 +0100
commit641d9f15ad12c3f580cf27c3fe4ee6dd16462f22 (patch)
tree567232c68f011345be1e61566f93bcb401bd8f3f /puppet/modules/site_config
parentf066f7a99a8d15f5b80c5bbf9117606c723ab352 (diff)
parentb4a32c98e5bd2184f6fc5fef1300e35ab36dbb99 (diff)
Merge branch 'develop' into feature/couchdb
Diffstat (limited to 'puppet/modules/site_config')
-rw-r--r--puppet/modules/site_config/manifests/sshd.pp9
1 files changed, 5 insertions, 4 deletions
diff --git a/puppet/modules/site_config/manifests/sshd.pp b/puppet/modules/site_config/manifests/sshd.pp
index 4834bb6f..944dbce2 100644
--- a/puppet/modules/site_config/manifests/sshd.pp
+++ b/puppet/modules/site_config/manifests/sshd.pp
@@ -1,8 +1,9 @@
class site_config::sshd {
- # configure ssh and inculde ssh-keys
+ # configure sshd
include sshd
- $ssh_pubkeys=hiera_hash('ssh_pubkeys')
include site_sshd
- notice($ssh_pubkeys)
- create_resources('site_sshd::ssh_key', $ssh_pubkeys)
+ # no need for configuring authorized_keys as leap_cli cares for that
+ #$ssh_pubkeys=hiera_hash('ssh_pubkeys')
+ #notice($ssh_pubkeys)
+ #create_resources('site_sshd::ssh_key', $ssh_pubkeys)
}