Done On 9/25/12 2:59 AM, "Noah Slater" <[email protected]> wrote:
>That still seems like a derivative work to me. But that may just be my OCD >kicking in. It might be cleaner to just remove the file, and commit a new >one comprising of our scripts and our key, value assignments. It seems >disingenuous to say that a file is not a derivative, when you can trace >it's history in Git back to an upstream file. > > >On Fri, Sep 21, 2012 at 10:35 PM, <[email protected]> wrote: > >> Updated Branches: >> refs/heads/master c28ab4ae4 -> feb77f313 >> >> >> CLOUDSTACK-171 reduce config file to bare minimum by eliminating >>commented >> lines and whitespace >> >> >> Project: >>http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo >> Commit: >> >>http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/feb77f >>31 >> Tree: >> >>http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/feb77f31 >> Diff: >> >>http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/feb77f31 >> >> Branch: refs/heads/master >> Commit: feb77f3137561d9383de695c626be68d7b59106f >> Parents: c28ab4a >> Author: Chiradeep Vittal <[email protected]> >> Authored: Fri Sep 21 14:33:45 2012 -0700 >> Committer: Chiradeep Vittal <[email protected]> >> Committed: Fri Sep 21 14:35:08 2012 -0700 >> >> ---------------------------------------------------------------------- >> patches/systemvm/debian/vpn/etc/ipsec.conf | 43 >>+---------------------- >> pom.xml | 1 - >> 2 files changed, 1 insertions(+), 43 deletions(-) >> ---------------------------------------------------------------------- >> >> >> >> >>http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/feb77f31 >>/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 >> index a1c4bfb..dc363b3 100644 >> --- a/patches/systemvm/debian/vpn/etc/ipsec.conf >> +++ b/patches/systemvm/debian/vpn/etc/ipsec.conf >> @@ -1,50 +1,9 @@ >> -# /etc/ipsec.conf - Openswan IPsec configuration file >> - >> -# This file: /usr/share/doc/openswan/ipsec.conf-sample >> -# >> # Manual: ipsec.conf.5 >> +version 2.0 >> >> - >> -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 >> >> >> >>http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/feb77f31 >>/pom.xml >> ---------------------------------------------------------------------- >> diff --git a/pom.xml b/pom.xml >> index 4742138..772f5df 100644 >> --- a/pom.xml >> +++ b/pom.xml >> @@ -249,7 +249,6 @@ >> >> >><exclude>patches/systemvm/debian/config/var/www/html/latest/.htaccess</ex >>clude> >> >> <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.conf</exclude> >> >> <exclude>patches/systemvm/debian/vpn/etc/ipsec.d/l2tp.conf</exclude> >> >> <exclude>patches/systemvm/debian/vpn/etc/ipsec.secrets</exclude> >> >> >><exclude>tools/devcloud/basebuild/puppet-devcloudinitial/files/network.co >>nf</exclude> >> >> > > >-- >NS
