[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 60620d3d4385628f9c5c7725d042b742940bbb28

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 60620d3d4385628f9c5c7725d042b742940bbb28

[git]

[-- Attachment #1: Type: text/plain, Size: 4208 bytes --]

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, next has been updated
       via  60620d3d4385628f9c5c7725d042b742940bbb28 (commit)
       via  2c9c92f4651fccdb18daa4da8adef5d1d4d9a716 (commit)
       via  8516edcc485a986f8be6b4483f7993456a5e75af (commit)
       via  8451f21315e9ccb4ffe2060c871b9eafa0823004 (commit)
      from  db2e0a5baecda01fe22a7bb17010dcb1a73b372b (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 60620d3d4385628f9c5c7725d042b742940bbb28
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date:   Tue Feb 3 12:19:51 2015 +0100

    BUG10730: delete creation of ovpnserver.log from lfs file

commit 2c9c92f4651fccdb18daa4da8adef5d1d4d9a716
Merge: 8516edc db2e0a5
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date:   Tue Feb 3 07:27:03 2015 +0100

    Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into BUG10730

commit 8516edcc485a986f8be6b4483f7993456a5e75af
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date:   Tue Feb 3 07:26:34 2015 +0100

    BUG10730: fix permissions of ovpnserver.log

commit 8451f21315e9ccb4ffe2060c871b9eafa0823004
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date:   Wed Jan 28 09:41:52 2015 +0100

    BUG10730: Change permission of /var/run/ovpnserver.log

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

Summary of changes:
 config/rootfiles/common/sysklogd | 1 -
 lfs/openvpn                      | 2 --
 lfs/sysklogd                     | 6 +++---
 src/misc-progs/openvpnctrl.c     | 4 ++++
 4 files changed, 7 insertions(+), 6 deletions(-)

Difference in files:
diff --git a/config/rootfiles/common/sysklogd b/config/rootfiles/common/sysklogd
index 14320a6..9792097 100644
--- a/config/rootfiles/common/sysklogd
+++ b/config/rootfiles/common/sysklogd
@@ -4,4 +4,3 @@ usr/sbin/syslogd
 #usr/share/man/man8/sysklogd.8
 var/log/dhcpcd.log
 var/log/messages
-var/log/ovpnserver.log
diff --git a/lfs/openvpn b/lfs/openvpn
index 487b6ca..a19ac1f 100644
--- a/lfs/openvpn
+++ b/lfs/openvpn
@@ -93,8 +93,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	chmod 700 /var/ipfire/ovpn/ovpn-leases.db
 	chown -R root:root /var/ipfire/ovpn/scripts
 	chown -R nobody:nobody /var/ipfire/ovpn
-	chown root.nobody /var/log/ovpnserver.log
-	chmod 660 /var/log/ovpnserver.log
 	chmod 700 /var/ipfire/ovpn/certs
 	mv -v /var/ipfire/ovpn/verify /usr/lib/openvpn/verify
 	chown root:root /usr/lib/openvpn/verify
diff --git a/lfs/sysklogd b/lfs/sysklogd
index 9c9dd0d..ca6110a 100644
--- a/lfs/sysklogd
+++ b/lfs/sysklogd
@@ -75,8 +75,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	#cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)_xen_empty_buffer_check.patch
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	touch /var/log/{dhcpcd.log,messages,ovpnserver.log}
-	chmod 664 /var/log/{dhcpcd.log,messages,ovpnserver.log}
-	chown 0:105 /var/log/{dhcpcd.log,messages,ovpnserver.log}
+	touch /var/log/{dhcpcd.log,messages}
+	chmod 664 /var/log/{dhcpcd.log,messages}
+	chown 0:105 /var/log/{dhcpcd.log,messages}
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/src/misc-progs/openvpnctrl.c b/src/misc-progs/openvpnctrl.c
index da5ee23..d20cced 100644
--- a/src/misc-progs/openvpnctrl.c
+++ b/src/misc-progs/openvpnctrl.c
@@ -469,6 +469,10 @@ void startDaemon(void) {
 		executeCommand(command);
 		snprintf(command, STRING_SIZE-1, "/usr/sbin/openvpn --config /var/ipfire/ovpn/server.conf");
 		executeCommand(command);
+		snprintf(command, STRING_SIZE-1, "/bin/chown root.nobody /var/run/ovpnserver.log");
+		executeCommand(command);
+		snprintf(command, STRING_SIZE-1, "/bin/chmod 644 /var/run/ovpnserver.log");
+		executeCommand(command);
 	}
 }
 


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