CLOUDSTACK-171 according to http://markmail.org/thread/hipzcgtc7qx2o7iz delete
first
Conflicts:
patches/systemvm/debian/vpn/etc/ipsec.conf
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7559ade4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7559ade4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7559ade4
Branch: refs/heads/4.0
Commit: 7559ade45e93f873d029a310b80f1bf9c9f153d2
Parents: 0167c34
Author: Edison Su <[email protected]>
Authored: Wed Sep 26 21:50:08 2012 -0700
Committer: Edison Su <[email protected]>
Committed: Wed Sep 26 21:50:08 2012 -0700
----------------------------------------------------------------------
patches/systemvm/debian/vpn/etc/ipsec.conf | 50 -----------------------
1 files changed, 0 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7559ade4/patches/systemvm/debian/vpn/etc/ipsec.conf
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/vpn/etc/ipsec.conf
b/patches/systemvm/debian/vpn/etc/ipsec.conf
deleted file mode 100644
index a1c4bfb..0000000
--- a/patches/systemvm/debian/vpn/etc/ipsec.conf
+++ /dev/null
@@ -1,50 +0,0 @@
-# /etc/ipsec.conf - Openswan IPsec configuration file
-
-# This file: /usr/share/doc/openswan/ipsec.conf-sample
-#
-# Manual: ipsec.conf.5
-
-
-version 2.0 # conforms to second version of ipsec.conf specification
-
-# basic configuration
-config setup
- # Do not set debug options to debug configuration issues!
- # plutodebug / klipsdebug = "all", "none" or a combation from below:
- # "raw crypt parsing emitting control klips pfkey natt x509 dpd private"
- # eg:
- # plutodebug="control parsing"
- #
- # enable to get logs per-peer
- # plutoopts="--perpeerlog"
- #
- # Again: only enable plutodebug or klipsdebug when asked by a developer
- #
- # NAT-TRAVERSAL support, see README.NAT-Traversal
- nat_traversal=yes
- # exclude networks used on server side by adding %v4:!a.b.c.0/24
- virtual_private=%v4:10.0.0.0/8,%v4:192.168.0.0/16,%v4:172.16.0.0/12
- # OE is now off by default. Uncomment and change to on, to enable.
- oe=off
- # which IPsec stack to use. auto will try netkey, then klips then mast
- protostack=auto
-
-
-# Add connections here
-
-# sample VPN connection
-# for more examples, see /etc/ipsec.d/examples/
-#conn sample
-# # Left security gateway, subnet behind it, nexthop toward right.
-# left=10.0.0.1
-# leftsubnet=172.16.0.0/24
-# leftnexthop=10.22.33.44
-# # Right security gateway, subnet behind it, nexthop toward left.
-# right=10.12.12.1
-# rightsubnet=192.168.0.0/24
-# rightnexthop=10.101.102.103
-# # To authorize this connection, but not actually start it,
-# # at startup, uncomment this.
-# #auto=add
-
-include /etc/ipsec.d/*.conf
