From 6ea188dcf955d9eed1e1cfcd9867c49149155199 Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Tue, 8 Mar 2011 12:29:49 +0000
Subject: reuse standard apache vhost type ( one less specific configuration
 file )

---
 modules/buildsystem/manifests/init.pp              | 5 +++--
 modules/buildsystem/templates/vhost_pkgsubmit.conf | 9 ---------
 2 files changed, 3 insertions(+), 11 deletions(-)
 delete mode 100644 modules/buildsystem/templates/vhost_pkgsubmit.conf

diff --git a/modules/buildsystem/manifests/init.pp b/modules/buildsystem/manifests/init.pp
index 74341057..712f2f72 100644
--- a/modules/buildsystem/manifests/init.pp
+++ b/modules/buildsystem/manifests/init.pp
@@ -46,8 +46,9 @@ class buildsystem {
             vhost_file => "buildsystem/vhost_repository.conf",
         }
 
-        apache::vhost_other_app { "pkgsubmit.$domain":
-            vhost_file => "buildsystem/vhost_pkgsubmit.conf",
+        apache::vhost_base { "pkgsubmit.$domain":
+            aliases => { "/uploads" => "$sched_home_dir/uploads" },
+            location => "/var/www/bs/",
         }
 
         include scheduler
diff --git a/modules/buildsystem/templates/vhost_pkgsubmit.conf b/modules/buildsystem/templates/vhost_pkgsubmit.conf
deleted file mode 100644
index d82e43b7..00000000
--- a/modules/buildsystem/templates/vhost_pkgsubmit.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<VirtualHost *:80>
-        ServerName pkgsubmit.<%= domain %>
-        DocumentRoot /var/www/bs/
-        Alias /uploads <%= sched_home_dir %>/uploads
-        <Location />
-          Allow from all
-          Options Indexes
-        </Location>
-</VirtualHost>
-- 
cgit v1.2.1