diff options
author | micah <micah@leap.se> | 2013-07-01 01:08:13 +0200 |
---|---|---|
committer | micah <micah@leap.se> | 2013-07-01 01:08:13 +0200 |
commit | 35f9bbda60c38c3b16cd1340b876ee09dd2f7e1d (patch) | |
tree | 04622b7127da0f32185551be2f6b93f65e1a9012 /puppet/modules/site_sshd/manifests/init.pp | |
parent | 4a102a1e9c856cb4df787f0aaa80747d4cdaa0c7 (diff) | |
parent | 6c34c73f7e4c5203321547b699c6eaba9de8e2fe (diff) |
Merge branch 'feature/authorized_keys' of /home/git/repositories/micah/leap_platform into develop
Diffstat (limited to 'puppet/modules/site_sshd/manifests/init.pp')
-rw-r--r-- | puppet/modules/site_sshd/manifests/init.pp | 38 |
1 files changed, 14 insertions, 24 deletions
diff --git a/puppet/modules/site_sshd/manifests/init.pp b/puppet/modules/site_sshd/manifests/init.pp index c1c4d3b3..90dd2d0e 100644 --- a/puppet/modules/site_sshd/manifests/init.pp +++ b/puppet/modules/site_sshd/manifests/init.pp @@ -2,12 +2,13 @@ class site_sshd { $ssh = hiera_hash('ssh') ## - ## XTERM TITLE + ## SETUP AUTHORIZED KEYS ## - file {'/etc/profile.d/xterm-title.sh': - source => "puppet://$server/modules/site_sshd/xterm-title.sh", - owner => root, group => 0, mode => 0644; + $authorized_keys = $ssh['authorized_keys'] + + class { 'site_sshd::deploy_authorized_keys': + keys => $authorized_keys } ## @@ -15,27 +16,16 @@ class site_sshd { ## $mosh = $ssh['mosh'] - $mosh_ports = $mosh['ports'] - if $ssh['mosh']['enabled'] { - $mosh_ensure = present - } else { - $mosh_ensure = absent - } - package { 'mosh': - ensure => $mosh_ensure; - } - file { '/etc/shorewall/macro.mosh': - ensure => $mosh_ensure, - content => "PARAM - - udp $mosh_ports", - notify => Service['shorewall'], - require => Package['shorewall']; + if $mosh['enabled'] { + class { 'site_sshd::mosh': + ensure => present, + ports => $mosh['ports'] + } } - shorewall::rule { 'net2fw-mosh': - ensure => $mosh_ensure, - source => 'net', - destination => '$FW', - action => 'mosh(ACCEPT)', - order => 200; + else { + class { 'site_sshd::mosh': + ensure => absent + } } } |