From 14805f6fc712aed61f16146b01e37596e7658cbe Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Tue, 5 Jun 2012 21:34:14 +0200
Subject: new style for 2.7

---
 manifests/base.pp   | 65 +++++++++++++++++++++++++++--------------------------
 manifests/gentoo.pp |  6 ++---
 manifests/init.pp   |  8 +++----
 3 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/manifests/base.pp b/manifests/base.pp
index af74656..0311aaa 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -1,37 +1,38 @@
 class denyhosts::base  {
-    package { denyhosts:
-        ensure => present,
-        require => [ File["/etc/denyhosts.conf"],
-            File["/var/lib/denyhosts/allowed-hosts"] ],
-    }
+  package { denyhosts:
+    ensure => present,
+    require => [ File["/etc/denyhosts.conf"],
+      File["/var/lib/denyhosts/allowed-hosts"] ],
+  }
 
-    service { denyhosts:
-        enable => true,
-        ensure => running,
-        require => [ Package[denyhosts],
-            File["/etc/denyhosts.conf"],
-            File["/var/lib/denyhosts/allowed-hosts"] ],
-    }
+  service { denyhosts:
+    enable => true,
+    ensure => running,
+    require => [ Package[denyhosts],
+      File["/etc/denyhosts.conf"],
+      File["/var/lib/denyhosts/allowed-hosts"] ],
+  }
 
-    file { '/etc/denyhosts.conf':
-            source => [ "puppet:///modules/site-denyhosts/${fqdn}/denyhosts.conf",
-                        "puppet:///modules/site-denyhosts/${operatingsystem}/denyhosts.conf",
-                        "puppet:///modules/site-denyhosts/denyhosts.conf",
-                        "puppet:///modules/denyhosts/${operatingsystem}/denyhosts.conf",
-                        "puppet:///modules/denyhosts/denyhosts.conf" ],
-            notify => Service[denyhosts],
-            mode => 0600, owner => root, group => 0;
-        '/var/lib/denyhosts':
-            ensure => directory,
-            before => Package[denyhosts],
-            owner => root, group => 0, mode => 0700;
-        '/var/lib/denyhosts/allowed-hosts':
-            source => "puppet:///modules/denyhosts/allowed-hosts",
-            replace => false,
-            before => Package[denyhosts],
-            notify => Service[denyhosts],
-            mode => 0600, owner => root, group => 0;
-    }
+  file {
+    '/etc/denyhosts.conf':
+      source => [ "puppet:///modules/site_denyhosts/${::fqdn}/denyhosts.conf",
+                 "puppet:///modules/site_denyhosts/${::operatingsystem}/denyhosts.conf",
+                  "puppet:///modules/site_denyhosts/denyhosts.conf",
+                  "puppet:///modules/denyhosts/${::operatingsystem}/denyhosts.conf",
+                  "puppet:///modules/denyhosts/denyhosts.conf" ],
+      notify => Service[denyhosts],
+      mode => 0600, owner => root, group => 0;
+    '/var/lib/denyhosts':
+      ensure => directory,
+      before => Package[denyhosts],
+      owner => root, group => 0, mode => 0700;
+    '/var/lib/denyhosts/allowed-hosts':
+      source => "puppet:///modules/denyhosts/allowed-hosts",
+      replace => false,
+      before => Package[denyhosts],
+      notify => Service[denyhosts],
+      mode => 0600, owner => root, group => 0;
+  }
 
-    Denyhosts::Allowed_host <<||>>
+  Denyhosts::Allowed_host <<||>>
 }
diff --git a/manifests/gentoo.pp b/manifests/gentoo.pp
index 46f5ced..9cabb40 100644
--- a/manifests/gentoo.pp
+++ b/manifests/gentoo.pp
@@ -1,5 +1,5 @@
 class denyhosts::gentoo inherits denyhosts::base {
-    Package[denyhosts]{
-        category => 'app-admin',
-    }
+  Package[denyhosts]{
+    category => 'app-admin',
+  }
 }
diff --git a/manifests/init.pp b/manifests/init.pp
index 0bf1124..0351724 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -15,8 +15,8 @@
 #
 
 class denyhosts {
-    case $operatingsystem {
-        gentoo: { include denyhosts::gentoo }
-        default: { include denyhosts::base }
-    }
+  case $::operatingsystem {
+    gentoo: { include denyhosts::gentoo }
+    default: { include denyhosts::base }
+  }
 }
-- 
cgit v1.2.3