Author:   Lars Michelsen <[email protected]>
Date:     Sun Jul 10 12:11:40 2011 +0200
Committer:   Lars Michelsen <[email protected]>
Commit-Date: Sun Jul 10 12:11:40 2011 +0200

Improved redirect handling of old URLs

---

 etc/apache2-nagvis.conf-sample |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/etc/apache2-nagvis.conf-sample b/etc/apache2-nagvis.conf-sample
index a38d73d..01d2e1d 100644
--- a/etc/apache2-nagvis.conf-sample
+++ b/etc/apache2-nagvis.conf-sample
@@ -32,20 +32,16 @@ Alias @NAGVIS_WEB@ "@NAGVIS_PATH@/share"
     # Use mod_rewrite for old url redirection even if there are php files which
     # redirect the queries itselfs. In some cases the mod_rewrite redirect
     # is better than the php redirect.
-    RewriteCond %{REQUEST_URI} ^@NAGVIS_WEB@(/index\.php|/|)(\?.*|)$
+    RewriteCond %{REQUEST_URI} 
^@NAGVIS_WEB@(/config\.php|/index\.php|/|)(\?.*|)$
     RewriteRule ^(index\.php|)(\?.*|)$ @NAGVIS_WEB@/frontend/nagvis-js/$1$2 
[R=301,L]
-    RewriteCond %{REQUEST_URI} ^@NAGVIS_WEB@/config\.php.*$
-    RewriteRule ^config\.php(.*) @NAGVIS_WEB@/frontend/wui/$1 [R=301,L]
     
     # Redirect old regular map links
-    RewriteCond %{REQUEST_URI} ^@NAGVIS_WEB@/frontend/nagvis-js
+    RewriteCond %{REQUEST_URI} ^@NAGVIS_WEB@/frontend/(wui|nagvis-js)
     RewriteCond %{QUERY_STRING} map=(.*)
     RewriteRule ^(.*)$ 
@NAGVIS_WEB@/frontend/nagvis-js/index.php?mod=Map&act=view&show=%1 [R=301,L]
-
-    # Redirect old wui map links
-    RewriteCond %{REQUEST_URI} ^@NAGVIS_WEB@/frontend/wui
-    RewriteCond %{QUERY_STRING} map=(.*)
-    RewriteRule ^(.*)$ 
@NAGVIS_WEB@/frontend/wui/index.php?mod=Map&act=edit&show=%1 [R=301,L]
+    # Without map= param
+    RewriteCond %{REQUEST_URI} ^@NAGVIS_WEB@/frontend(/wui|)/?(index.php)?$
+    RewriteRule ^(.*)$ @NAGVIS_WEB@/frontend/nagvis-js/index.php [R=301,L]
 
     # Redirect old rotation calls
     RewriteCond %{REQUEST_URI} ^@NAGVIS_WEB@/frontend/nagvis-js


------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security 
threats, fraudulent activity, and more. Splunk takes this data and makes 
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins

Reply via email to