From 21af2f933a3472a44ed1a8c1082c4e68f530ec5b Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mageia.org>
Date: Fri, 4 Apr 2014 11:46:45 +0000
Subject: Attempt to support alias in catalyst_app

---
 modules/apache/manifests/vhost/catalyst_app.pp   | 8 ++++++++
 modules/apache/templates/vhost_catalyst_app.conf | 5 ++---
 modules/mga-mirrors/manifests/init.pp            | 3 +++
 3 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'modules')

diff --git a/modules/apache/manifests/vhost/catalyst_app.pp b/modules/apache/manifests/vhost/catalyst_app.pp
index 54a00fb2..655dc7ba 100644
--- a/modules/apache/manifests/vhost/catalyst_app.pp
+++ b/modules/apache/manifests/vhost/catalyst_app.pp
@@ -2,12 +2,20 @@ define apache::vhost::catalyst_app( $script,
                                     $location = '',
                                     $process = 4,
                                     $use_ssl = false,
+                                    $aliases = {},
                                     $vhost = false) {
     include apache::mod::fastcgi
+    if $location {
+      $aliases = merge($aliases, {'/static'] => "$location/root/static"})
+    }
+
+    $aliases = merge($aliases, {'/' => $script})
+
     apache::vhost::base { $name:
         vhost   => $vhost,
         use_ssl => $use_ssl,
         content => template('apache/vhost_catalyst_app.conf'),
+        aliases => $aliases,
     }
 }
 
diff --git a/modules/apache/templates/vhost_catalyst_app.conf b/modules/apache/templates/vhost_catalyst_app.conf
index eaa652d7..13b73cc0 100644
--- a/modules/apache/templates/vhost_catalyst_app.conf
+++ b/modules/apache/templates/vhost_catalyst_app.conf
@@ -1,5 +1,4 @@
-<%- if location != '' then -%>
-Alias /static <%= location %>/root/static
+<%- aliases.keys.sort {|a,b| a.size <=> b.size }.reverse.each do |key| -%>
+        Alias <%= key %> <%= aliases[key] %>
 <%- end -%>
-Alias / <%= script %>/
 FastCgiServer <%= script %> -processes <%= process %> -idle-timeout 30
diff --git a/modules/mga-mirrors/manifests/init.pp b/modules/mga-mirrors/manifests/init.pp
index b29c6fcb..cd1b57ef 100644
--- a/modules/mga-mirrors/manifests/init.pp
+++ b/modules/mga-mirrors/manifests/init.pp
@@ -7,6 +7,9 @@ class mga-mirrors {
     apache::vhost::catalyst_app { $vhost:
         script  => '/usr/bin/mga_mirrors_fastcgi.pl',
         require => Package['mga-mirrors'],
+        aliases => {
+            '/status' => '/var/www/mirrors/status.html',
+        }
     }
 
     apache::vhost::base { "ssl_$vhost":
-- 
cgit v1.2.1