Revision

412

Author

misc

Date

2010-11-23 02:14:05 +0100 (Tue, 23 Nov 2010)

Log Message

- it is IMHO cleaner and logical to have apache::vhost_other_app directly requiring apache::base rather than letting every people adding it when using the class

Modified Paths

• puppet/modules/apache/manifests/init.pp
• puppet/modules/buildsystem/manifests/init.pp

Modified: puppet/modules/apache/manifests/init.pp
===================================================================
--- puppet/modules/apache/manifests/init.pp	2010-11-23 01:11:15 UTC (rev 411)
+++ puppet/modules/apache/manifests/init.pp	2010-11-23 01:14:05 UTC (rev 412)
@@ -130,6 +130,7 @@
     }
 
    define vhost_other_app($vhost_file) {
+        include apache::base
         file { "$name.conf":
             path => "/etc/httpd/conf/vhosts.d/$name.conf",
             ensure => "present",

Modified: puppet/modules/buildsystem/manifests/init.pp
===================================================================
--- puppet/modules/buildsystem/manifests/init.pp	2010-11-23 01:11:15 UTC (rev 411)
+++ puppet/modules/buildsystem/manifests/init.pp	2010-11-23 01:14:05 UTC (rev 412)
@@ -27,7 +27,6 @@
             ensure => "installed"
         }
 
-        include apache::base
         apache::vhost_other_app { "repository.$domain":
             vhost_file => "buildsystem/vhost_repository.conf",
         }