summaryrefslogtreecommitdiff
path: root/manifests/centos
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/centos')
-rw-r--r--manifests/centos/itk.pp4
-rw-r--r--manifests/centos/itk_plus.pp15
2 files changed, 16 insertions, 3 deletions
diff --git a/manifests/centos/itk.pp b/manifests/centos/itk.pp
index 46a5225..9e97fa0 100644
--- a/manifests/centos/itk.pp
+++ b/manifests/centos/itk.pp
@@ -5,8 +5,6 @@ class apache::centos::itk inherits apache::centos {
name => 'httpd-itk',
}
File['apache_service_config']{
- source => [ "puppet:///modules/site-apache/service/CentOS/${fqdn}/httpd.itk",
- "puppet:///modules/site-apache/service/CentOS/httpd.itk",
- "puppet:///modules/apache/service/CentOS/httpd.itk" ],
+ source => "puppet:///modules/apache/service/CentOS/httpd.itk"
}
}
diff --git a/manifests/centos/itk_plus.pp b/manifests/centos/itk_plus.pp
new file mode 100644
index 0000000..f73be04
--- /dev/null
+++ b/manifests/centos/itk_plus.pp
@@ -0,0 +1,15 @@
+# http://hostby.net/home/2008/07/12/centos-5-and-mpm-itk/
+class apache::centos::itk_plus inherits apache::centos::itk {
+ Line['pidfile_httpd.conf','listen_httpd.conf']{
+ ensure => absent,
+ }
+
+ Apache::Config::Global['00-listen.conf']{
+ ensure => present,
+ content => template("apache/itk_plus/${operatingsystem}/00-listen.conf.erb"),
+ }
+
+ File['apache_service_config']{
+ source => "puppet:///modules/apache/service/CentOS/httpd.itk_plus"
+ }
+}