From d6bd706eaeaca53b9e8ca6389a51d6f41e87198c Mon Sep 17 00:00:00 2001
From: Nicolas Vigier <boklm@mageia.org>
Date: Wed, 2 Mar 2011 19:54:46 +0000
Subject: use vhost_base instead of vhost_other_app

---
 modules/sympa/manifests/init.pp       | 10 +++-------
 modules/sympa/templates/vhost_ml.conf |  7 -------
 2 files changed, 3 insertions(+), 14 deletions(-)

(limited to 'modules')

diff --git a/modules/sympa/manifests/init.pp b/modules/sympa/manifests/init.pp
index c8792037..4ea4f37d 100644
--- a/modules/sympa/manifests/init.pp
+++ b/modules/sympa/manifests/init.pp
@@ -56,15 +56,11 @@ class sympa {
    
         apache::vhost_redirect_ssl { "$vhost": }
  
-        apache::vhost_other_app { "$vhost":
-            vhost_file => "sympa/vhost_ml.conf",
+        apache::vhost_base { "$vhost":
+	    use_ssl => true,
+            content => template("sympa/vhost_ml.conf"),
         }
 
-        openssl::self_signed_cert{ "$vhost":
-            directory => "/etc/ssl/apache/"
-        }
-    
-
         @@postgresql::database { 'sympa':
             description => "Sympa database",
             user => "sympa",
diff --git a/modules/sympa/templates/vhost_ml.conf b/modules/sympa/templates/vhost_ml.conf
index acdbc8e8..f8441677 100644
--- a/modules/sympa/templates/vhost_ml.conf
+++ b/modules/sympa/templates/vhost_ml.conf
@@ -1,8 +1,3 @@
-<VirtualHost *:443>
-	ServerName ml.<%= domain %>
-    SSLEngine on
-    SSLCertificateFile /etc/ssl/apache/ml.<%= domain %>.pem
-    SSLCertificateKeyFile /etc/ssl/apache/ml.<%= domain %>.pem
 	
     DocumentRoot <%= lib_dir + "/sympa/cgi" %>
  	<Location />
@@ -16,5 +11,3 @@
         Allow from all
     </Directory>
 
-
-</VirtualHost>
-- 
cgit v1.2.1