summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2009-05-23 01:02:09 +0200
committermh <mh@immerda.ch>2009-05-23 01:02:09 +0200
commit915b19343c58deaf7ceca344d47d8f0fbcbd02fb (patch)
tree6de6f611b901ff39e54c56363819a1906a0bb5ba /manifests
parent180c13e4cc88e5d3e49c0a2c8d2d34ecc531c044 (diff)
put the override in the correct class
Diffstat (limited to 'manifests')
-rw-r--r--manifests/base/itk.pp4
-rw-r--r--manifests/centos/itk.pp1
-rw-r--r--manifests/package/itk.pp5
3 files changed, 6 insertions, 4 deletions
diff --git a/manifests/base/itk.pp b/manifests/base/itk.pp
index 8a25bc5..7772bfd 100644
--- a/manifests/base/itk.pp
+++ b/manifests/base/itk.pp
@@ -1,8 +1,4 @@
class apache::base::itk inherits apache::base {
- Package['apache'] {
- name => 'apache2-itk',
- }
-
File['htpasswd_dir']{
group => 0,
mode => 0644,
diff --git a/manifests/centos/itk.pp b/manifests/centos/itk.pp
index 8b55110..c2f07e0 100644
--- a/manifests/centos/itk.pp
+++ b/manifests/centos/itk.pp
@@ -1,6 +1,7 @@
# http://hostby.net/home/2008/07/12/centos-5-and-mpm-itk/
class apache::centos::itk inherits apache::centos {
include ::apache::base::itk
+ include ::apache::package::itk
Package['apache']{
name => 'httpd-itk',
}
diff --git a/manifests/package/itk.pp b/manifests/package/itk.pp
new file mode 100644
index 0000000..4ca9960
--- /dev/null
+++ b/manifests/package/itk.pp
@@ -0,0 +1,5 @@
+class apache::package::itk inherits apache::package {
+ Package['apache'] {
+ name => 'apache2-itk',
+ }
+}