summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorMarc Fournier <marc.fournier@camptocamp.com>2011-11-15 13:05:20 +0100
committerMarc Fournier <marc.fournier@camptocamp.com>2011-11-15 13:05:20 +0100
commit762dffd677cd8b167a65c0a7595a48530c4cd091 (patch)
tree9f652d8f843d73caf1976d9bcea98b8555df9b82 /manifests
parent7ce24e0cf63318cae52fde37ffdedb3b4bc2b81e (diff)
file renaming to be compliant with recommended module structure.
Diffstat (limited to 'manifests')
-rw-r--r--manifests/base.pp13
-rw-r--r--manifests/classes/augeas.pp48
-rw-r--r--manifests/debian.pp10
-rw-r--r--manifests/init.pp13
-rw-r--r--manifests/redhat.pp10
5 files changed, 45 insertions, 49 deletions
diff --git a/manifests/base.pp b/manifests/base.pp
new file mode 100644
index 0000000..8f9d557
--- /dev/null
+++ b/manifests/base.pp
@@ -0,0 +1,13 @@
+class augeas::base {
+
+ # ensure no file not managed by puppet ends up in there.
+ file { "/usr/share/augeas/lenses/contrib":
+ ensure => directory,
+ recurse => true,
+ purge => true,
+ force => true,
+ mode => 0644,
+ owner => "root",
+ group => "root",
+ }
+}
diff --git a/manifests/classes/augeas.pp b/manifests/classes/augeas.pp
deleted file mode 100644
index 85a9046..0000000
--- a/manifests/classes/augeas.pp
+++ /dev/null
@@ -1,48 +0,0 @@
-class augeas {
-
- if ( ! $augeas_version ) {
- $augeas_version = "present"
- }
-
- case $operatingsystem {
- /RedHat|CentOS|Fedora/: { include augeas::redhat }
- /Debian|Ubuntu|kFreeBSD/: { include augeas::debian }
- default: { include augeas::base }
- }
-}
-
-class augeas::base {
-
- # ensure no file not managed by puppet ends up in there.
- file { "/usr/share/augeas/lenses/contrib":
- ensure => directory,
- recurse => true,
- purge => true,
- force => true,
- mode => 0644,
- owner => "root",
- group => "root",
- }
-}
-
-class augeas::redhat inherits augeas::base {
-
- package {
- ["augeas", "augeas-libs"]:
- ensure => $augeas_version,
- before => File["/usr/share/augeas/lenses/contrib"],
- }
- package { "ruby-augeas": ensure => present }
-
-}
-
-class augeas::debian inherits augeas::base {
-
- package {
- ["augeas-lenses", "libaugeas0", "augeas-tools"]:
- ensure => $augeas_version,
- before => File["/usr/share/augeas/lenses/contrib"],
- }
- package { "libaugeas-ruby1.8": ensure => present }
-
-}
diff --git a/manifests/debian.pp b/manifests/debian.pp
new file mode 100644
index 0000000..51203b4
--- /dev/null
+++ b/manifests/debian.pp
@@ -0,0 +1,10 @@
+class augeas::debian inherits augeas::base {
+
+ package {
+ ["augeas-lenses", "libaugeas0", "augeas-tools"]:
+ ensure => $augeas_version,
+ before => File["/usr/share/augeas/lenses/contrib"],
+ }
+ package { "libaugeas-ruby1.8": ensure => present }
+
+}
diff --git a/manifests/init.pp b/manifests/init.pp
index b33bf58..a9ebad0 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1 +1,12 @@
-import "classes/*.pp"
+class augeas {
+
+ if ( ! $augeas_version ) {
+ $augeas_version = "present"
+ }
+
+ case $operatingsystem {
+ /RedHat|CentOS|Fedora/: { include augeas::redhat }
+ /Debian|Ubuntu|kFreeBSD/: { include augeas::debian }
+ default: { include augeas::base }
+ }
+}
diff --git a/manifests/redhat.pp b/manifests/redhat.pp
new file mode 100644
index 0000000..4632fc1
--- /dev/null
+++ b/manifests/redhat.pp
@@ -0,0 +1,10 @@
+class augeas::redhat inherits augeas::base {
+
+ package {
+ ["augeas", "augeas-libs"]:
+ ensure => $augeas_version,
+ before => File["/usr/share/augeas/lenses/contrib"],
+ }
+ package { "ruby-augeas": ensure => present }
+
+}