projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
danzi: merge dsa-postgres2-danzi and dsa-postgres2-danzi6
[mirror/dsa-puppet.git]
/
modules
/
ssh
/
manifests
/
init.pp
diff --git
a/modules/ssh/manifests/init.pp
b/modules/ssh/manifests/init.pp
index
43d89df
..
bd3600e
100644
(file)
--- a/
modules/ssh/manifests/init.pp
+++ b/
modules/ssh/manifests/init.pp
@@
-15,9
+15,11
@@
class ssh {
}
ferm::rule { 'dsa-ssh-sources':
description => 'Allow SSH from DSA',
}
ferm::rule { 'dsa-ssh-sources':
description => 'Allow SSH from DSA',
+ domain => '(ip ip6)',
chain => 'ssh',
rule => 'saddr ($SSH_SOURCES) ACCEPT'
}
chain => 'ssh',
rule => 'saddr ($SSH_SOURCES) ACCEPT'
}
+ Ferm::Rule::Simple <<| tag == 'ssh::server::from::nagios' |>>
file { '/etc/ssh/ssh_config':
content => template('ssh/ssh_config.erb'),
file { '/etc/ssh/ssh_config':
content => template('ssh/ssh_config.erb'),
@@
-47,13
+49,13
@@
class ssh {
}
if (versioncmp($::lsbmajdistrelease, '8') >= 0) {
}
if (versioncmp($::lsbmajdistrelease, '8') >= 0) {
- if ! $
has_etc_ssh_ssh_host_ed25519_key
{
+ if ! $
facts['has_etc_ssh_ssh_host_ed25519_key']
{
exec { 'create-ed25519-host-key':
command => 'ssh-keygen -f /etc/ssh/ssh_host_ed25519_key -q -P "" -t ed25519',
}
}
exec { 'create-ed25519-host-key':
command => 'ssh-keygen -f /etc/ssh/ssh_host_ed25519_key -q -P "" -t ed25519',
}
}
- if $
systemd
{
+ if $
facts['systemd']
{
package { [ 'libpam-systemd' ]:
ensure => installed
}
package { [ 'libpam-systemd' ]:
ensure => installed
}