summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2014-05-27 15:11:45 -0400
committerMicah Anderson <micah@leap.se>2014-05-27 19:55:32 -0400
commit120cbfd46b79cfec36c17ae6deb7fc51f9094594 (patch)
tree4ab5e0f2633628cbe5e48f6b448e76cea49525aa /puppet
parent3290e4b6c0655616c1a4374595af3a2eb95c85d8 (diff)
Switch away from site_config::sshd and instead just include site_sshd
The existing site_config::sshd had a non-functioning 'include sshd' line in it that was not doing what was expected (this was supposed to include the sshd module, but due to scoping was including itself). It seemed better to eliminate some of the unused pieces and consolidate into one config location. Change-Id: I79dd904e696ca646180a09abbb03b5361dfc8ab9
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_config/manifests/default.pp2
-rw-r--r--puppet/modules/site_config/manifests/sshd.pp9
-rw-r--r--puppet/modules/site_sshd/manifests/init.pp1
3 files changed, 2 insertions, 10 deletions
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp
index c7352857..dfdffe03 100644
--- a/puppet/modules/site_config/manifests/default.pp
+++ b/puppet/modules/site_config/manifests/default.pp
@@ -18,7 +18,7 @@ class site_config::default {
include site_config::sysctl
# configure ssh and include ssh-keys
- include site_config::sshd
+ include site_sshd
# include classes for special environments
# i.e. openstack/aws nodes, vagrant nodes
diff --git a/puppet/modules/site_config/manifests/sshd.pp b/puppet/modules/site_config/manifests/sshd.pp
deleted file mode 100644
index 8ff337a0..00000000
--- a/puppet/modules/site_config/manifests/sshd.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-class site_config::sshd {
- # configure sshd
- include sshd
- include site_sshd
- # 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)
-}
diff --git a/puppet/modules/site_sshd/manifests/init.pp b/puppet/modules/site_sshd/manifests/init.pp
index d9bc1d51..e81780ef 100644
--- a/puppet/modules/site_sshd/manifests/init.pp
+++ b/puppet/modules/site_sshd/manifests/init.pp
@@ -22,6 +22,7 @@ class site_sshd {
group => root,
mode => '0644',
content => template('site_sshd/ssh_known_hosts.erb');
+
'/etc/ssh/ssh_config':
owner => root,
group => root,