etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Erik Weber 2014-08-25 21:50:34 +02:00 committed by Sebastien Goasguen
parent b866fe750c
commit b3bfe21cf1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
systemvm/patches/debian/config/opt/cloud/bin/vmdata.py
View File

@ -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"