cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seb...@apache.org
Subject git commit: updated refs/heads/4.3 to b3bfe21
Date Tue, 26 Aug 2014 09:03:32 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.3 b866fe750 -> b3bfe21cf


CLOUDSTACK-7405: Allow all VR urls to be accessed without trailing slash

Signed-off-by: Erik Weber <terbolous@gmail.com>
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b3bfe21c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b3bfe21c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b3bfe21c

Branch: refs/heads/4.3
Commit: b3bfe21cf1e3c73ebdc6b597f32558b63b2fe519
Parents: b866fe7
Author: Erik Weber <terbolous@gmail.com>
Authored: Mon Aug 25 21:50:34 2014 +0200
Committer: Sebastien Goasguen <runseb@gmail.com>
Committed: Tue Aug 26 05:02:50 2014 -0400

----------------------------------------------------------------------
 systemvm/patches/debian/config/opt/cloud/bin/vmdata.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b3bfe21c/systemvm/patches/debian/config/opt/cloud/bin/vmdata.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/vmdata.py b/systemvm/patches/debian/config/opt/cloud/bin/vmdata.py
index a44c134..bcf3f34 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/vmdata.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/vmdata.py
@@ -121,7 +121,7 @@ def createfile(ip, folder, file, data):
         os.chmod(metamanifest, 0644)
 
 def htaccess(ip, folder, file):
-    entry = "RewriteRule ^" + file + "$  ../" + folder + "/%{REMOTE_ADDR}/" + file + " [L,NC,QSA]"
+    entry = "RewriteRule ^" + file + "/?$  ../" + folder + "/%{REMOTE_ADDR}/" + file + "
[L,NC,QSA]"
     htaccessFolder = "/var/www/html/latest"
     htaccessFile = htaccessFolder + "/.htaccess"
 
@@ -167,7 +167,7 @@ def htaccess(ip, folder, file):
     fh.close()
 
     if folder == "metadata" or folder == "meta-data":
-        entry = "RewriteRule ^meta-data/(.+)$  ../" + folder + "/%{REMOTE_ADDR}/$1 [L,NC,QSA]"
+        entry = "RewriteRule ^meta-data/(.+[^/])/?$  ../" + folder + "/%{REMOTE_ADDR}/$1
[L,NC,QSA]"
         htaccessFolder = "/var/www/html/latest"
         htaccessFile = htaccessFolder + "/.htaccess"
 


Mime
View raw message