Module: nagvis
Branch: master
Commit: 0c7fc87be063d3d5a995828f0ae32c06a4e4d992
URL:    
http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=0c7fc87be063d3d5a995828f0ae32c06a4e4d992

Author: Lars Michelsen <[email protected]>
Date:   Wed Apr 21 23:44:40 2010 +0200

Added additional mod_rewrite rules to default apache configuration

---

 etc/apache2-nagvis.conf-sample |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/etc/apache2-nagvis.conf-sample b/etc/apache2-nagvis.conf-sample
index 40f9c47..b353821 100644
--- a/etc/apache2-nagvis.conf-sample
+++ b/etc/apache2-nagvis.conf-sample
@@ -32,14 +32,20 @@ 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.*$
-    RewriteRule ^index\.php(.*) @NAGVIS_WEB@/frontend/nagvis-js/$1 [R=301,L]
-    RewriteCond %{REQUEST_URI} ^...@nagvis_web@/config.php.*$
+    RewriteCond %{REQUEST_URI} ^...@nagvis_web@(/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 map links (FIXME)
-    #RewriteCond %{REQUEST_URI} 
^...@nagvis_web@/frontend/nagvis-js/index.php?map=(.*)$
-    #RewriteRule ^index\.php(.*) 
@NAGVIS_WEB@/frontend/nagvis-js/?mod=Map&act=view&show=%1 [R=301,L]
+    # Redirect old regular map links
+    RewriteCond %{REQUEST_URI} ^...@nagvis_web@/frontend/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]
   </IfModule>
 </Directory>
 


------------------------------------------------------------------------------
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins

Reply via email to