Revision
117
Author
misc
Date
2010-11-05 01:12:10 +0100 (Fri, 05 Nov 2010)

Log Message

- add a alias for apache package ( so we can change the engine )
- add a file to cleanly add the 2 directive for VirtualHost on 80 and 443 
without having to import the whole apache config in svn ( as this would be annoying to merge later )

Modified Paths

Added Paths

Modified: puppet/modules/apache/manifests/init.pp
===================================================================
--- puppet/modules/apache/manifests/init.pp	2010-11-04 23:53:46 UTC (rev 116)
+++ puppet/modules/apache/manifests/init.pp	2010-11-05 00:12:10 UTC (rev 117)
@@ -2,6 +2,7 @@
 
     class base {
         package { "apache-mpm-prefork":
+            alias => apache,
             ensure => installed
         }
     
@@ -10,6 +11,17 @@
             ensure => running,
             subscribe => [ Package['apache-mpm-prefork'] ],
         }
+
+        file { "customization.conf":
+            ensure => present,
+            path => "/etc/httpd/conf/customization.conf",
+            content => template("apache/customization.conf"),
+            require => Package["apache"],
+            notify => Service["apache"],
+            owner => root,
+            group => root,
+            mode => 644,
+        }
     }
     
     class mod_php inherits base {

Added: puppet/modules/apache/templates/customization.conf
===================================================================
--- puppet/modules/apache/templates/customization.conf	                        (rev 0)
+++ puppet/modules/apache/templates/customization.conf	2010-11-05 00:12:10 UTC (rev 117)
@@ -0,0 +1,2 @@
+NameVirtualHost *:80
+NameVirtualHost *:443