From 77e5ab2105793545b18680d1f0f84bf5a26d2ecf Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Tue, 5 Jun 2012 22:09:15 -0300
Subject: fix for new style for 2.7

---
 manifests/base.pp    | 34 +++++++++++++++++-----------------
 manifests/centos.pp  | 16 ++++++++--------
 manifests/gentoo.pp  |  6 +++---
 manifests/include.pp |  4 ++--
 manifests/init.pp    | 16 ++++++++--------
 manifests/munin.pp   | 10 +++++-----
 6 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/manifests/base.pp b/manifests/base.pp
index 2c7710c..d4ba93b 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -1,21 +1,21 @@
 class squid::base {
-    package { 'squid':
-        ensure => present,
-    }
+  package { 'squid':
+    ensure => present,
+  }
 
-    service{'squid':
-        enable => true,
-        ensure => running,
-        hasstatus => true,
-        require => Package[squid],
-    }
+  service{'squid':
+    enable => true,
+    ensure => running,
+    hasstatus => true,
+    require => Package[squid],
+  }
 
-    file {"squid_config":
-        path => "/etc/squid/squid.conf",
-        ensure => file, owner => root, group => root, mode => 644,
-        source => [ "puppet:///modules/site-squid/${::fqdn}/squid.conf",
-                    "puppet:///modules/site-squid/squid.conf",
-                    "puppet:///modules/squid/squid.conf" ],
-        notify => Service[squid],
-    }
+  file {"squid_config":
+    path => "/etc/squid/squid.conf",
+    source => [ "puppet:///modules/site_squid/${::fqdn}/squid.conf",
+                "puppet:///modules/site_squid/squid.conf",
+                "puppet:///modules/squid/squid.conf" ],
+    notify => Service[squid],
+    owner => root, group => root, mode => 644;
+  }
 }
diff --git a/manifests/centos.pp b/manifests/centos.pp
index c58b8ce..f481d7e 100644
--- a/manifests/centos.pp
+++ b/manifests/centos.pp
@@ -2,12 +2,12 @@
 # http://people.redhat.com/mnagy/squid/
 # distro rpms seems to have problems...
 class squid::centos inherits squid::base {
-    file{'/etc/sysconfig/squid':
-        source => [ "puppet:///modules/site-squid/sysconfig/${::fqdn}/squid",
-                    "puppet:///modules/site-squid/sysconfig/squid",
-                    "puppet:///modules/squid/sysconfig/squid" ],
-        require => Package['squid'],
-        notify => Service['squid'],
-        owner => root, group => 0, mode => '0644';
-    }
+  file{'/etc/sysconfig/squid':
+    source => [ "puppet:///modules/site_squid/sysconfig/${::fqdn}/squid",
+                "puppet:///modules/site_squid/sysconfig/squid",
+                "puppet:///modules/squid/sysconfig/squid" ],
+     require => Package['squid'],
+     notify => Service['squid'],
+     owner => root, group => 0, mode => '0644';
+  }
 }
diff --git a/manifests/gentoo.pp b/manifests/gentoo.pp
index 148c894..3cbddda 100644
--- a/manifests/gentoo.pp
+++ b/manifests/gentoo.pp
@@ -1,5 +1,5 @@
 class squid::gentoo inherits squid::base {
-    Package[squid]{
-        category => 'net-proxy',
-    }
+  Package[squid]{
+    category => 'net-proxy',
+  }
 }
diff --git a/manifests/include.pp b/manifests/include.pp
index 673411d..a66a256 100644
--- a/manifests/include.pp
+++ b/manifests/include.pp
@@ -9,8 +9,8 @@ define squid::include($content = undef){
 
   if !$content {
     File["/etc/squid/include.d/${name}"]{
-      source => [ "puppet:///modules/site-squid/include.d/${::fqdn}/${name}",
-                  "puppet:///modules/site-squid/include.d/${name}" ]
+      source => [ "puppet:///modules/site_squid/include.d/${::fqdn}/${name}",
+                  "puppet:///modules/site_squid/include.d/${name}" ]
     }
   } else {
     File["/etc/squid/include.d/${name}"]{
diff --git a/manifests/init.pp b/manifests/init.pp
index 7afab95..3c6a8e5 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -3,13 +3,13 @@
 #
 
 class squid {
-    case $::operatingsystem {
-        gentoo: { include squid::gentoo }
-        centos: { include squid::centos }
-        default: { include squid::base }
-    }
+  case $::operatingsystem {
+    gentoo: { include squid::gentoo }
+    centos: { include squid::centos }
+    default: { include squid::base }
+  }
 
-    if hiera('use_munin',false) {
-        include squid::munin
-    }
+  if hiera('use_munin',false) {
+    include squid::munin
+  }
 }
diff --git a/manifests/munin.pp b/manifests/munin.pp
index 56f5319..743293a 100644
--- a/manifests/munin.pp
+++ b/manifests/munin.pp
@@ -1,9 +1,9 @@
 # manifests/munin.pp
 
 class squid::munin {
-    munin::plugin{ 'squid_cache': }
-    munin::plugin{ 'squid_icp': }
-    munin::plugin::deploy{'squid':
-        source => "squid/munin/squid",
-    }
+  munin::plugin{ 'squid_cache': }
+  munin::plugin{ 'squid_icp': }
+  munin::plugin::deploy{'squid':
+    source => "squid/munin/squid",
+  }
 }
-- 
cgit v1.2.3