apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-20 12:33:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix meta data returning 404 issue on vmware

Browse Source
This commit is contained in:
Edison Su 2011-07-25 21:17:35 -07:00
parent 7d914666b4
commit 3a17b37808
1 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
patches/systemvm/debian/config/root/userdata.sh
View File

@ -37,13 +37,14 @@ create_htaccess() {
local result=0 local result=0
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" htaccessFolder="/var/www/html/latest"
htaccessFile=$htaccessFolder/.htaccess htaccessFile=$htaccessFolder/.htaccess
mkdir -p $htaccessFolder mkdir -p $htaccessFolder
touch $htaccessFile touch $htaccessFile
grep -F \"$entry\" $htaccessFile grep -w $file $htaccessFile
if [ \$? -gt 0 ]; then
if [ $? -gt 0 ]; then
echo -e $entry >> $htaccessFile; echo -e $entry >> $htaccessFile;
fi fi
result=$? result=$?
@ -58,26 +59,6 @@ create_htaccess() {
result=$? result=$?
fi fi
#support access by http://<dhcp server>/latest/<metadata key> (legacy, see above) also
# http://<dhcp server>/latest/meta-data/<metadata key> (correct)
if [ "$folder" == "metadata" ] || [ "$folder" == "meta-data" ]
then
entry="RewriteRule ^meta-data/(.+)$ ../$folder/%{REMOTE_ADDR}/\$1 [L,NC,QSA]"
htaccessFolder="/var/www/html/latest"
htaccessFile=$htaccessFolder/.htaccess
grep -F "$entry" $htaccessFile
if [ $? -gt 0 ]
then
echo -e "$entry" >> $htaccessFile
fi
entry="RewriteRule ^meta-data/$ ../$folder/%{REMOTE_ADDR}/meta-data [L,NC,QSA]"
grep -F "$entry" $htaccessFile
if [ $? -gt 0 ]
then
echo -e "$entry" >> $htaccessFile
fi
result=$?
fi
return $result return $result
} }
@ -140,15 +121,15 @@ done
[ "$vmIp" == "" ] || [ "$folder" == "" ] || [ "$file" == "" ] && usage [ "$vmIp" == "" ] || [ "$folder" == "" ] || [ "$file" == "" ] && usage
[ "$folder" != "userdata" ] && [ "$folder" != "metadata" ] && usage [ "$folder" != "userdata" ] && [ "$folder" != "metadata" ] && usage
create_htaccess $vmIp $folder $file
if [ $? -gt 0 ]
then
exit 1
fi
if [ "$dataFile" != "" ] if [ "$dataFile" != "" ]
then then
create_htaccess $vmIp $folder $file
if [ $? -gt 0 ]
then
exit 1
fi
copy_vm_data_file $vmIp $folder $file $dataFile copy_vm_data_file $vmIp $folder $file $dataFile
else else
delete_vm_data_file $vmIp $folder $file delete_vm_data_file $vmIp $folder $file