CLOUDSTACK-170 remove unneeded secrets file
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/43c91573
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/43c91573
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/43c91573
Branch: refs/heads/4.0
Commit: 43c915732344c6fe035143d50f1556e767ec3947
Parents: 7583f02
Author: Edison Su <[email protected]>
Authored: Fri Sep 28 10:40:13 2012 -0700
Committer: Edison Su <[email protected]>
Committed: Fri Sep 28 10:40:13 2012 -0700
----------------------------------------------------------------------
patches/systemvm/debian/vpn/etc/ipsec.secrets.orig | 11 -----------
pom.xml | 1 -
2 files changed, 0 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/43c91573/patches/systemvm/debian/vpn/etc/ipsec.secrets.orig
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/vpn/etc/ipsec.secrets.orig
b/patches/systemvm/debian/vpn/etc/ipsec.secrets.orig
deleted file mode 100644
index 6885545..0000000
--- a/patches/systemvm/debian/vpn/etc/ipsec.secrets.orig
+++ /dev/null
@@ -1,11 +0,0 @@
-# RCSID $Id: ipsec.secrets.proto,v 1.3.6.1 2005/09/28 13:59:14 paul Exp $
-# This file holds shared secrets or RSA private keys for inter-Pluto
-# authentication. See ipsec_pluto(8) manpage, and HTML documentation.
-
-# RSA private key for this host, authenticating it to any other host
-# which knows the public part. Suitable public keys, for ipsec.conf, DNS,
-# or configuration of other implementations, can be extracted conveniently
-# with "ipsec showhostkey".
-
-# this file is managed with debconf and will contain the automatically created
RSA keys
-include /var/lib/openswan/ipsec.secrets.inc
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/43c91573/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>
