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 2017/02/03 01:08:32 UTC

[1/3] git commit: updated refs/heads/master to 8e069ed

Repository: cloudstack
Updated Branches:
  refs/heads/master 5309c4205 -> 8e069ed13


FIX issue on preshared key if we disable/enable remote access vpn

Way to reproduce the issue
(1) enable remote access vpn
root@r-8349-VM:~# cat /etc/ipsec.d/ipsec.any.secrets
: PSK "mVSx5KDXCPYX7X5DGb2W8yNW"

(2) disable/enable vpn
root@r-8349-VM:~# cat /etc/ipsec.d/ipsec.any.secrets
: PSK "mVSx5KDXCPYX7X5DGb2W8yNW"
: PSK "HeV3dHZpZXt4chhfvhx8D83C"

Expected configuration:
root@r-8349-VM:~# cat /etc/ipsec.d/ipsec.any.secrets
: PSK "HeV3dHZpZXt4chhfvhx8D83C"


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

Branch: refs/heads/master
Commit: 16c2cd0244e65238fa1aa7fe85fe2636a2298a7c
Parents: 41f7eb6
Author: Wei Zhou <w....@global.leaseweb.com>
Authored: Thu Jan 5 12:14:13 2017 +0100
Committer: Wei Zhou <w....@global.leaseweb.com>
Committed: Thu Jan 5 12:14:13 2017 +0100

----------------------------------------------------------------------
 systemvm/patches/debian/config/opt/cloud/bin/configure.py | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/16c2cd02/systemvm/patches/debian/config/opt/cloud/bin/configure.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/configure.py b/systemvm/patches/debian/config/opt/cloud/bin/configure.py
index 5a2a9ed..bdcfec9 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/configure.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/configure.py
@@ -659,6 +659,7 @@ class CsRemoteAccessVpn(CsDataBag):
 
 
         secret = CsFile(vpnsecretfilte)
+        secret.empty()
         secret.addeq(": PSK \"%s\"" %psk)
         secret.commit()

[2/3] git commit: updated refs/heads/master to 8e069ed

Posted by ra...@apache.org.
Merge pull request #1890 from ustcweizhou/vpn-preshared-key-issue

[4.9] CLOUDSTACK-9712: FIX issue on preshared key if we disable/enable remote access vpnWay to reproduce the issue
(1) enable remote access vpn
root@r-8349-VM:~# cat /etc/ipsec.d/ipsec.any.secrets
: PSK "mVSx5KDXCPYX7X5DGb2W8yNW"

(2) disable/enable vpn
root@r-8349-VM:~# cat /etc/ipsec.d/ipsec.any.secrets
: PSK "mVSx5KDXCPYX7X5DGb2W8yNW"
: PSK "HeV3dHZpZXt4chhfvhx8D83C"

Expected configuration:
root@r-8349-VM:~# cat /etc/ipsec.d/ipsec.any.secrets
: PSK "HeV3dHZpZXt4chhfvhx8D83C"

* pr/1890:
  FIX issue on preshared key if we disable/enable remote access vpn

Signed-off-by: Rajani Karuturi <ra...@accelerite.com>


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

Branch: refs/heads/master
Commit: c8916792c66f98d553acabf9dc225114d0a601ba
Parents: 42f0340 16c2cd0
Author: Rajani Karuturi <ra...@accelerite.com>
Authored: Fri Feb 3 06:37:50 2017 +0530
Committer: Rajani Karuturi <ra...@accelerite.com>
Committed: Fri Feb 3 06:37:50 2017 +0530

----------------------------------------------------------------------
 systemvm/patches/debian/config/opt/cloud/bin/configure.py | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------

[3/3] git commit: updated refs/heads/master to 8e069ed

Posted by ra...@apache.org.
Merge release branch 4.9 to master

* 4.9:
  FIX issue on preshared key if we disable/enable remote access vpn


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

Branch: refs/heads/master
Commit: 8e069ed1321340d1acf60b7dc9ca2d13c8020d67
Parents: 5309c42 c891679
Author: Rajani Karuturi <ra...@accelerite.com>
Authored: Fri Feb 3 06:38:14 2017 +0530
Committer: Rajani Karuturi <ra...@accelerite.com>
Committed: Fri Feb 3 06:38:14 2017 +0530

----------------------------------------------------------------------
 systemvm/patches/debian/config/opt/cloud/bin/configure.py | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------