summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2015-09-11 08:34:57 -0400
committerMicah Anderson <micah@leap.se>2015-09-11 08:34:57 -0400
commitc0c06c6be819126cec6adb359a7e52c95f51defe (patch)
treea24e98248ba506dcfd883533c2e301030b080ec2 /puppet/modules
parent84e6ad1978f8952e28d8935c01b4344c0d62ddbd (diff)
parent818930af8a05dc44372b99f8e589527050120431 (diff)
Merge remote-tracking branch 'elijah/feature/sshconfig' into develop
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/site_sshd/manifests/init.pp18
1 files changed, 10 insertions, 8 deletions
diff --git a/puppet/modules/site_sshd/manifests/init.pp b/puppet/modules/site_sshd/manifests/init.pp
index 1da2f1d5..170be32c 100644
--- a/puppet/modules/site_sshd/manifests/init.pp
+++ b/puppet/modules/site_sshd/manifests/init.pp
@@ -1,6 +1,7 @@
class site_sshd {
- $ssh = hiera_hash('ssh')
- $hosts = hiera('hosts', '')
+ $ssh = hiera_hash('ssh')
+ $ssh_config = $ssh['config']
+ $hosts = hiera('hosts', '')
##
## SETUP AUTHORIZED KEYS
@@ -52,11 +53,12 @@ class site_sshd {
## SSHD SERVER CONFIGURATION
##
class { '::sshd':
- manage_nagios => false,
- ports => [ $ssh['port'] ],
- use_pam => 'yes',
- hardened_ssl => 'yes',
- print_motd => 'no',
- manage_client => false
+ manage_nagios => false,
+ ports => [ $ssh['port'] ],
+ use_pam => 'yes',
+ hardened_ssl => 'yes',
+ print_motd => 'no',
+ tcp_forwarding => $ssh_config['AllowTcpForwarding'],
+ manage_client => false
}
}