NagVis

Author:   Lars Michelsen <lm@...>
Date:     Sun Jul 10 12:11:40 2011 +0200
Committer:   Lars Michelsen <lm@...>
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@..."
     # 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@...|/|)(\?.*|)$
+    RewriteCond %{REQUEST_URI} ^@NAGVIS_WEB@...|/|)(\?.*|)$
     RewriteRule ^(index\.php|)(\?.*|)$ @NAGVIS_WEB@... [R=301,L]
-    RewriteCond %{REQUEST_URI} ^@NAGVIS_WEB@....*$
-    RewriteRule ^config\.php(.*) @NAGVIS_WEB@... [R=301,L]
     
     # Redirect old regular map links
-    RewriteCond %{REQUEST_URI} ^@NAGVIS_WEB@...
+    RewriteCond %{REQUEST_URI} ^@NAGVIS_WEB@...)
     RewriteCond %{QUERY_STRING} map=(.*)
     RewriteRule ^(.*)$ @NAGVIS_WEB@... [R=301,L]
-
-    # Redirect old wui map links
-    RewriteCond %{REQUEST_URI} ^@NAGVIS_WEB@...
-    RewriteCond %{QUERY_STRING} map=(.*)
-    RewriteRule ^(.*)$ @NAGVIS_WEB@... [R=301,L]
+    # Without map= param
+    RewriteCond %{REQUEST_URI} ^@NAGVIS_WEB@...)?$
+    RewriteRule ^(.*)$ @NAGVIS_WEB@... [R=301,L]
 
     # Redirect old rotation calls
     RewriteCond %{REQUEST_URI} ^@NAGVIS_WEB@...