From 36e751e92b341313ab429bd87df090a340f95594 Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Fri, 5 Nov 2010 00:12:10 +0000
Subject: - 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 )

---
 modules/apache/manifests/init.pp            | 12 ++++++++++++
 modules/apache/templates/customization.conf |  2 ++
 2 files changed, 14 insertions(+)
 create mode 100644 modules/apache/templates/customization.conf

(limited to 'modules/apache')

diff --git a/modules/apache/manifests/init.pp b/modules/apache/manifests/init.pp
index 8818f973..4a1fe962 100644
--- a/modules/apache/manifests/init.pp
+++ b/modules/apache/manifests/init.pp
@@ -2,6 +2,7 @@ class apache {
 
     class base {
         package { "apache-mpm-prefork":
+            alias => apache,
             ensure => installed
         }
     
@@ -10,6 +11,17 @@ class apache {
             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 {
diff --git a/modules/apache/templates/customization.conf b/modules/apache/templates/customization.conf
new file mode 100644
index 00000000..81424c42
--- /dev/null
+++ b/modules/apache/templates/customization.conf
@@ -0,0 +1,2 @@
+NameVirtualHost *:80
+NameVirtualHost *:443
-- 
cgit v1.2.1