You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ch...@apache.org on 2012/09/21 23:40:32 UTC
git commit: CLOUDSTACK-170 remove unneeded file
Updated Branches:
refs/heads/master feb77f313 -> f27168291
CLOUDSTACK-170 remove unneeded file
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/f2716829
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f2716829
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/f2716829
Branch: refs/heads/master
Commit: f27168291a84e0790b1e0fa5e16fadd540cce87b
Parents: feb77f3
Author: Chiradeep Vittal <ch...@apache.org>
Authored: Fri Sep 21 14:38:46 2012 -0700
Committer: Chiradeep Vittal <ch...@apache.org>
Committed: Fri Sep 21 14:39:41 2012 -0700
----------------------------------------------------------------------
patches/systemvm/debian/vpn/etc/ipsec.conf.orig | 48 ------------------
pom.xml | 1 -
2 files changed, 0 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f2716829/patches/systemvm/debian/vpn/etc/ipsec.conf.orig
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/vpn/etc/ipsec.conf.orig b/patches/systemvm/debian/vpn/etc/ipsec.conf.orig
deleted file mode 100644
index d185e6c..0000000
--- a/patches/systemvm/debian/vpn/etc/ipsec.conf.orig
+++ /dev/null
@@ -1,48 +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
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f2716829/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 772f5df..fad7c27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -247,7 +247,6 @@
<exclude>patches/systemvm/debian/config/var/lib/misc/dnsmasq.leases</exclude>
<exclude>patches/systemvm/debian/config/var/www/html/userdata/.htaccess</exclude>
<exclude>patches/systemvm/debian/config/var/www/html/latest/.htaccess</exclude>
- <exclude>patches/systemvm/debian/vpn/etc/ipsec.conf.orig</exclude>
<exclude>patches/systemvm/debian/vpn/etc/ipsec.secrets.orig</exclude>
<exclude>patches/systemvm/debian/vpn/etc/ipsec.d/l2tp.conf</exclude>
<exclude>patches/systemvm/debian/vpn/etc/ipsec.secrets</exclude>