From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated.
 51379603c8161d5ef6ede182251789d098a3d833
Date: Sun, 16 Dec 2012 21:07:51 +0100
Message-ID: <20121216200752.452C82030C@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6369354693527511905=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============6369354693527511905==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  51379603c8161d5ef6ede182251789d098a3d833 (commit)
      from  f17d112c0480e951771bdca5f5eace7592ecd2c2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 51379603c8161d5ef6ede182251789d098a3d833
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Dec 16 21:06:40 2012 +0100

    openvpn ccd: Multiple installation fixes.

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/common/configroot | 4 ++++
 lfs/configroot                     | 4 ++--
 src/scripts/ovpn-ccd-convert       | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/con=
figroot
index e14f7e0..1d2fc9d 100644
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -110,6 +110,10 @@ var/ipfire/outgoing/defaultservices
 #var/ipfire/outgoing/p2protocols
 #var/ipfire/outgoing/rules
 #var/ipfire/outgoing/settings
+var/ipfire/ovpn
+var/ipfire/ovpn/ccd.conf
+var/ipfire/ovpn/ccdroute
+var/ipfire/ovpn/ccdroute2
 var/ipfire/pakfire
 #var/ipfire/pakfire/settings
 #var/ipfire/patches
diff --git a/lfs/configroot b/lfs/configroot
index 90f5afa..f8fe426 100644
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -53,7 +53,7 @@ $(TARGET) :
 	for i in addon-lang auth backup ca certs connscheduler crls ddns dhcp dhcpc=
 dmzholes dns \
 			ethernet extrahd/bin fwlogs isdn key langs logging mac main  menu.d modem=
 net-traffic \
 			net-traffic/templates nfs optionsfw outgoing/bin outgoing/groups outgoing=
/groups/ipgroups \
-			outgoing/groups/macgroups patches pakfire portfw ppp private proxy/advanc=
ed/cre \
+			outgoing/groups/macgroups ovpn patches pakfire portfw ppp private proxy/a=
dvanced/cre \
 			proxy/calamaris/bin qos/bin red remote sensors snort time tripwire/report=
 \
 			updatexlrator/bin updatexlrator/autocheck urlfilter/autoupdate urlfilter/=
bin upnp vpn \
 			wakeonlan wireless xtaccess ; do \
@@ -66,7 +66,7 @@ $(TARGET) :
 	    dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dmzholes/config dn=
s/settings ethernet/aliases ethernet/settings ethernet/known_nics ethernet/sc=
anned_nics \
 	    extrahd/scan extrahd/devices extrahd/partitions extrahd/settings fwlogs=
/ipsettings fwlogs/portsettings \
 	    isdn/settings mac/settings main/disable_nf_sip main/hosts main/routing =
main/settings net-traffic/settings optionsfw/settings outgoing/settings outgo=
ing/rules \
-	    pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settin=
gs-3 ppp/settings-4 \
+	    ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/conf=
ig ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
 	    ppp/settings-5 ppp/settings proxy/settings proxy/advanced/settings prox=
y/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses=
 qos/level7config qos/portconfig \
 	    qos/tosconfig snort/settings tripwire/settings upnp/settings vpn/config=
 vpn/settings vpn/ipsec.conf \
 	    vpn/ipsec.secrets vpn/caconfig wakeonlan/clients.conf wireless/config w=
ireless/settings; do \
diff --git a/src/scripts/ovpn-ccd-convert b/src/scripts/ovpn-ccd-convert
index c54e256..ac76435 100644
--- a/src/scripts/ovpn-ccd-convert
+++ b/src/scripts/ovpn-ccd-convert
@@ -48,3 +48,4 @@ if ($running eq 'on')
 {
 	system('/usr/local/bin/openvpnctrl', '-s');
 }
+system ("chown nobody:nobody /var/ipfire/ovpn/ccd/*");


hooks/post-receive
--
IPFire 2.x development tree

--===============6369354693527511905==--