You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/11/06 16:08:30 UTC
[1/2] git commit: updated refs/heads/4.4 to a458383
Repository: cloudstack
Updated Branches:
refs/heads/4.4 d5b201462 -> a458383d0
CLOUDSTACK-7855: NIC3 should set MTU and not NIC1 for storage network nic
The fix also persists the configuration in /etc/network/interfaces
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e274948e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e274948e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e274948e
Branch: refs/heads/4.4
Commit: e274948e7c31fdc992476fd2f46aed310dbe98a0
Parents: d5b2014
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Nov 6 20:35:13 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Nov 6 20:35:13 2014 +0530
----------------------------------------------------------------------
systemvm/patches/debian/config/etc/init.d/cloud-early-config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e274948e/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 bbf1998..97bca12 100755
--- a/systemvm/patches/debian/config/etc/init.d/cloud-early-config
+++ b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
@@ -1112,6 +1112,7 @@ setup_storage_network() {
echo "auto eth3" >> /etc/network/interfaces
setup_interface "3" "$STORAGE_IP" "$STORAGE_NETMASK"
+ [ -n "$MTU" ] && ifconfig eth3 mtu $MTU && echo " mtu $MTU" >> /etc/network/interfaces
#ip route add "$STORAGE_CIDR" via "$STORAGE_IP"
log_it "Successfully setup storage network with STORAGE_IP:$STORAGE_IP, STORAGE_NETMASK:$STORAGE_NETMASK, STORAGE_CIDR:$STORAGE_CIDR"
}
@@ -1122,7 +1123,6 @@ setup_secstorage() {
local hyp=$1
setup_common eth0 eth1 eth2
setup_storage_network
- [ -n "$MTU" ] && ifconfig eth1 mtu $MTU
sed -i /gateway/d /etc/hosts
public_ip=$ETH2_IP
[ "$ETH2_IP" == "0.0.0.0" ] && public_ip=$ETH1_IP
[2/2] git commit: updated refs/heads/4.4 to a458383
Posted by bh...@apache.org.
CVE20143566: Avoid using SSLv3 on apache2 that runs on SSVM
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a458383d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a458383d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a458383d
Branch: refs/heads/4.4
Commit: a458383d0a27d012ac0acbd8d84198b52d4ae2cc
Parents: e274948
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Nov 6 20:36:43 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Nov 6 20:36:43 2014 +0530
----------------------------------------------------------------------
tools/appliance/definitions/systemvm64template/postinstall.sh | 1 +
tools/appliance/definitions/systemvmtemplate/postinstall.sh | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a458383d/tools/appliance/definitions/systemvm64template/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvm64template/postinstall.sh b/tools/appliance/definitions/systemvm64template/postinstall.sh
index ad40303..a4d3cbe 100644
--- a/tools/appliance/definitions/systemvm64template/postinstall.sh
+++ b/tools/appliance/definitions/systemvm64template/postinstall.sh
@@ -215,6 +215,7 @@ configure_apache2() {
# Backup stock apache configuration since we may modify it in Secondary Storage VM
cp /etc/apache2/sites-available/default /etc/apache2/sites-available/default.orig
cp /etc/apache2/sites-available/default-ssl /etc/apache2/sites-available/default-ssl.orig
+ sed -i 's/SSLProtocol all -SSLv2$/SSLProtocol all -SSLv2 -SSLv3/g' /etc/apache2/mods-available/ssl.conf
}
configure_services() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a458383d/tools/appliance/definitions/systemvmtemplate/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
index 3212c4f..b59d3aa 100644
--- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh
+++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
@@ -205,6 +205,7 @@ configure_apache2() {
# Backup stock apache configuration since we may modify it in Secondary Storage VM
cp /etc/apache2/sites-available/default /etc/apache2/sites-available/default.orig
cp /etc/apache2/sites-available/default-ssl /etc/apache2/sites-available/default-ssl.orig
+ sed -i 's/SSLProtocol all -SSLv2$/SSLProtocol all -SSLv2 -SSLv3/g' /etc/apache2/mods-available/ssl.conf
}
configure_services() {