stop using virtual resources for ferm::rule

[mirror/dsa-puppet.git] / modules / ssh / manifests / init.pp

diff --git a/modules/ssh/manifests/init.pp b/modules/ssh/manifests/init.pp
index d86093e..139a373 100644 (file)
--- a/modules/ssh/manifests/init.pp
+++ b/modules/ssh/manifests/init.pp
@@ -9,11 +9,11 @@ class ssh {
                require => Package['openssh-server']
        }
 
-       @ferm::rule { 'dsa-ssh':
+       ferm::rule { 'dsa-ssh':
                description => 'Allow SSH from DSA',
                rule        => '&SERVICE_RANGE(tcp, ssh, $SSH_SOURCES)'
        }
-       @ferm::rule { 'dsa-ssh-v6':
+       ferm::rule { 'dsa-ssh-v6':
                description => 'Allow SSH from DSA',
                domain      => 'ip6',
                rule        => '&SERVICE_RANGE(tcp, ssh, $SSH_V6_SOURCES)'
@@ -37,7 +37,7 @@ class ssh {
                content => template('ssh/authorized_keys.erb'),
        }
 
-       if ($::lsbmajdistrelease >= 8) {
+       if (versioncmp($::lsbmajdistrelease, '8') >= 0) {
                if ! $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',