Modified: puppet/modules/apache/manifests/init.pp
===================================================================
--- puppet/modules/apache/manifests/init.pp 2010-11-18 10:04:30 UTC (rev 279)
+++ puppet/modules/apache/manifests/init.pp 2010-11-18 15:55:02 UTC (rev 280)
@@ -128,4 +128,29 @@
content => template("apache/django.wsgi")
}
}
+
+ define vhost_other_app($vhost_file) {
+ file { "$name.conf":
+ path => "/etc/httpd/conf/vhosts.d/$name.conf",
+ ensure => "present",
+ owner => root,
+ group => root,
+ mode => 644,
+ notify => Service['apache'],
+ content => template($vhost_file)
+ }
+ }
+
+ define webapp_other($webapp_file) {
+ $webappname = $name
+ file { "webapp_$name.conf":
+ path => "/etc/httpd/conf/webapps.d/$webappname.conf",
+ ensure => "present",
+ owner => root,
+ group => root,
+ mode => 644,
+ notify => Service['apache'],
+ content => template($webapp_file)
+ }
+ }
}