projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "make englund a mailrelay"
[mirror/dsa-puppet.git]
/
modules
/
ssh
/
manifests
/
init.pp
diff --git
a/modules/ssh/manifests/init.pp
b/modules/ssh/manifests/init.pp
index
c6d1646
..
98add73
100644
(file)
--- a/
modules/ssh/manifests/init.pp
+++ b/
modules/ssh/manifests/init.pp
@@
-4,13
+4,6
@@
class ssh {
openssh-server: ensure => installed;
}
openssh-server: ensure => installed;
}
- case $hostname {
- bartok, beethoven: {
- $keyinfo = allnodeinfo("sshRSAHostKey", "ipHostNumber")
- }
- }
-
-
file { "/etc/ssh/ssh_config":
source => [ "puppet:///ssh/ssh_config" ],
require => Package["openssh-client"]
file { "/etc/ssh/ssh_config":
source => [ "puppet:///ssh/ssh_config" ],
require => Package["openssh-client"]
@@
-40,11
+33,14
@@
class ssh {
@ferm::rule { "dsa-ssh":
description => "Allow SSH from DSA",
@ferm::rule { "dsa-ssh":
description => "Allow SSH from DSA",
- rule => "
proto tcp mod state state (NEW) dport (ssh) @subchain 'ssh' { saddr (\$SSH_SOURCES) ACCEPT; }
"
+ rule => "
&SERVICE_RANGE(tcp, ssh, \$SSH_SOURCES)
"
}
@ferm::rule { "dsa-ssh-v6":
description => "Allow SSH from DSA",
domain => "ip6",
}
@ferm::rule { "dsa-ssh-v6":
description => "Allow SSH from DSA",
domain => "ip6",
- rule => "
proto tcp mod state state (NEW) dport (ssh) @subchain 'ssh' { saddr (\$SSH_V6_SOURCES) ACCEPT; }
"
+ rule => "
&SERVICE_RANGE(tcp, ssh, \$SSH_V6_SOURCES)
"
}
}
}
}
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: