update to 0.25.x style

4 files changed, 39 insertions, 43 deletions

diff --git a/manifests/base.pp b/manifests/base.pp
new file mode 100644
index 0000000..c43e4f2
--- /dev/null
+++ b/manifests/base.pp
@@ -0,0 +1,21 @@
+class squid::base {
+    package { 'squid':
+        ensure => present,
+    }
+
+    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://$server/modules/site-squid/${fqdn}/squid.conf",
+                    "puppet://$server/modules/site-squid/squid.conf",
+                    "puppet://$server/modules/squid/squid.conf" ],
+        notify => Service[squid],
+    }
+}
diff --git a/manifests/centos.pp b/manifests/centos.pp
new file mode 100644
index 0000000..ef1a09f
--- /dev/null
+++ b/manifests/centos.pp
@@ -0,0 +1,13 @@
+# rpms: we got the latest rpm from here:
+# http://people.redhat.com/mnagy/squid/
+# distro rpms seems to have problems...
+class squid::centos inherits squid::base {
+    file{'/etc/sysconfig/squid':
+        source => [ "puppet://$server/modules/site-squid/sysconfig/${fqdn}/squid",
+                    "puppet://$server/modules/site-squid/sysconfig/squid",
+                    "puppet://$server/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
new file mode 100644
index 0000000..148c894
--- /dev/null
+++ b/manifests/gentoo.pp
@@ -0,0 +1,5 @@
+class squid::gentoo inherits squid::base {
+    Package[squid]{
+        category => 'net-proxy',
+    }
+}
diff --git a/manifests/init.pp b/manifests/init.pp
index e230b9a..599a338 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -15,46 +15,3 @@ class squid {
         include squid::munin
     }
 }
-
-
-class squid::base {
-    package { 'squid':
-        ensure => present,
-    }
-
-    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://$server/files/squid/${fqdn}/squid.conf",
-                    "puppet://$server/files/squid/squid.conf",
-                    "puppet://$server/modules/squid/squid.conf" ],
-        notify => Service[squid],
-    }
-}
-
-class squid::gentoo inherits squid::base {
-    Package[squid]{
-        category => 'net-proxy',
-    }
-}
-
-# rpms: we got the latest rpm from here:
-# http://people.redhat.com/mnagy/squid/
-# distro rpms seems to have problems...
-class squid::centos inherits squid::base {
-    file{'/etc/sysconfig/squid':
-        source => [ "puppet://$server/files/squid/sysconfig/${fqdn}/squid",
-                    "puppet://$server/files/squid/sysconfig/squid",
-                    "puppet://$server/modules/squid/sysconfig/squid" ],
-        require => Package['squid'],
-        notify => Service['squid'],
-        owner => root, group => 0, mode => '0644';
-    }
-}