summaryrefslogtreecommitdiff
path: root/puppet/modules/site_sshd/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/modules/site_sshd/manifests')
-rw-r--r--puppet/modules/site_sshd/manifests/init.pp15
-rw-r--r--puppet/modules/site_sshd/manifests/known_hosts.pp11
2 files changed, 12 insertions, 14 deletions
diff --git a/puppet/modules/site_sshd/manifests/init.pp b/puppet/modules/site_sshd/manifests/init.pp
index d2b13822..2bcde603 100644
--- a/puppet/modules/site_sshd/manifests/init.pp
+++ b/puppet/modules/site_sshd/manifests/init.pp
@@ -13,11 +13,20 @@ class site_sshd {
}
##
- ## SETUP KNOWN HOSTS
+ ## SETUP KNOWN HOSTS and SSH_CONFIG
##
- class { 'site_sshd::known_hosts':
- hosts => $hosts
+ file {
+ '/etc/ssh/ssh_known_hosts':
+ owner => root,
+ group => root,
+ mode => '0644',
+ content => template('site_sshd/ssh_known_hosts.erb');
+ '/etc/ssh/ssh_config':
+ owner => root,
+ group => root,
+ mode => '0644',
+ content => template('site_sshd/ssh_config.erb');
}
##
diff --git a/puppet/modules/site_sshd/manifests/known_hosts.pp b/puppet/modules/site_sshd/manifests/known_hosts.pp
deleted file mode 100644
index 290ffd0b..00000000
--- a/puppet/modules/site_sshd/manifests/known_hosts.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-class site_sshd::known_hosts ($hosts) {
- # these owner and permissions seem odd to me, but it is what is defined
- # in modules/sshd/manifests/client/base.pp, so we are going to stick with it.
- file { '/etc/ssh/ssh_known_hosts':
- ensure => present,
- owner => root,
- group => 0,
- mode => '0644',
- content => template('site_sshd/ssh_known_hosts.erb');
- }
-}