You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2015/01/09 04:48:14 UTC
git commit: updated refs/heads/volume-upload to 2c169bc
Repository: cloudstack
Updated Branches:
refs/heads/volume-upload 2a4ca1b9c -> 2c169bc02
volume-upload added a upload url redirect in apache conf
rewrite engine is on only in the case fo SSVM
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2c169bc0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2c169bc0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2c169bc0
Branch: refs/heads/volume-upload
Commit: 2c169bc02d3136ec9bb80bc8249d9209fceb3ab2
Parents: 2a4ca1b
Author: Rajani Karuturi <ra...@gmail.com>
Authored: Fri Jan 9 09:16:00 2015 +0530
Committer: Rajani Karuturi <ra...@gmail.com>
Committed: Fri Jan 9 09:16:00 2015 +0530
----------------------------------------------------------------------
.../debian/config/etc/apache2/sites-available/default-ssl | 5 +++++
systemvm/patches/debian/config/etc/init.d/cloud-early-config | 4 ++++
2 files changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2c169bc0/systemvm/patches/debian/config/etc/apache2/sites-available/default-ssl
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/apache2/sites-available/default-ssl b/systemvm/patches/debian/config/etc/apache2/sites-available/default-ssl
index 0eea44d..5cc236e 100644
--- a/systemvm/patches/debian/config/etc/apache2/sites-available/default-ssl
+++ b/systemvm/patches/debian/config/etc/apache2/sites-available/default-ssl
@@ -168,5 +168,10 @@
# MSIE 7 and newer should be able to use keepalive
BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
+ RewriteEngine Off
+ RewriteCond %{HTTPS} =on
+ RewriteCond %{REQUEST_METHOD} =POST
+ RewriteRule ^/upload/(.*) http://localhost:8210/upload?uuid=$1 [P,L]
+
</VirtualHost>
</IfModule>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2c169bc0/systemvm/patches/debian/config/etc/init.d/cloud-early-config
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/init.d/cloud-early-config b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
index 9942f2d..e835a7e 100755
--- a/systemvm/patches/debian/config/etc/init.d/cloud-early-config
+++ b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
@@ -1155,6 +1155,10 @@ setup_secstorage() {
setup_sshd $ETH0_IP "eth0"
fi
setup_apache2 $ETH2_IP
+ a2enmod proxy
+ a2enmod proxy_http
+ [ -f /etc/apache2/sites-available/default-ssl ] && sed -i -e "s/RewriteEngine Off/RewriteEngine On/" /etc/apache2/sites-available/default-ssl
+ service apache2 restart
disable_rpfilter
enable_fwding 0