deploy fail2bansunet-ops-2015-04-14-v38

2 files changed, 4 insertions, 2 deletions

diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 6621c68..c313a0a 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -697,7 +697,6 @@ node 'cdr1.sunet.se' {
 }
 
 node 'sto-tug-kvm2.swamid.se' {
-   class { 'sunet::fail2ban': }
    package {'nagios-nrpe-server':
        ensure => 'installed',
    } ->
@@ -827,7 +826,6 @@ class quantis {
 }
 
 class webcommon {
-   class { 'sunet::fail2ban': }
 }
 
 class webfrontend {
diff --git a/global/overlay/etc/puppet/modules/sunet/manifests/server.pp b/global/overlay/etc/puppet/modules/sunet/manifests/server.pp
index 14df323..d89302f 100644
--- a/global/overlay/etc/puppet/modules/sunet/manifests/server.pp
+++ b/global/overlay/etc/puppet/modules/sunet/manifests/server.pp
@@ -1,5 +1,8 @@
 define sunet::server() {
 
+  # fail2ban
+  class { 'sunet::fail2ban': }
+
   # Set up encrypted swap
   sunet::encrypted_swap { 'sunet_encrypted_swap': }
 
@@ -84,4 +87,5 @@ define line($file, $line, $ensure = 'present') {
       }
     }
   }
+
 }