From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 8d679040b7798330441c470ae361ec67db00b635
Date: Mon, 13 Apr 2015 11:39:29 +0200 [thread overview]
Message-ID: <20150413093929.48FAB21AD0@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 3635 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, master has been updated
via 8d679040b7798330441c470ae361ec67db00b635 (commit)
via 5c5b4000b9053d8bf993d5d0a87393f7540786c9 (commit)
via 9aeac09636461df05f2423b65f7e0dc476eb0eb9 (commit)
via 01c82dbaa325336698b3c826ba0ba451b90eefe0 (commit)
from abd93c424197b8e0bd3dbc57fcef43cdfc0141ab (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 8d679040b7798330441c470ae361ec67db00b635
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Apr 13 11:39:08 2015 +0200
core89: Move converter to the end because collectd should be restarted at last
commit 5c5b4000b9053d8bf993d5d0a87393f7540786c9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Apr 13 10:57:09 2015 +0200
vpn-stats: Show daily graph as *all* other graphs do, too
commit 9aeac09636461df05f2423b65f7e0dc476eb0eb9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Apr 13 10:49:14 2015 +0200
core89: Fix permissions of /var/ipfire/dns
commit 01c82dbaa325336698b3c826ba0ba451b90eefe0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Apr 13 10:24:44 2015 +0200
core89: Create temporary files in update to avoid reboot
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/89/update.sh | 9 +++++++++
html/cgi-bin/netovpnrw.cgi | 2 +-
html/cgi-bin/netovpnsrv.cgi | 2 +-
3 files changed, 11 insertions(+), 2 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/89/update.sh b/config/rootfiles/core/89/update.sh
index 832feaa..bb6c7a5 100644
--- a/config/rootfiles/core/89/update.sh
+++ b/config/rootfiles/core/89/update.sh
@@ -68,10 +68,19 @@ rm -f \
/opt/pakfire/db/*/meta-sqlite \
/opt/pakfire/db/rootfiles/sqlite
+mkdir -p /var/run/openvpn
+touch /var/run/ovpnserver.log
+chown nobody.nobody \
+ /var/run/openvpn \
+ /var/run/ovpnserver.log
+
# Update OpenVPN/collectd configuration
/usr/sbin/ovpn-collectd-convert
chown nobody.nobody /var/ipfire/ovpn/collectd.vpn
+# Fix permissions
+chown nobody.nobody /var/ipfire/dns
+
# Fix #10625
mkdir -p /etc/logrotate.d
diff --git a/html/cgi-bin/netovpnrw.cgi b/html/cgi-bin/netovpnrw.cgi
index e0b1148..fed6d4d 100755
--- a/html/cgi-bin/netovpnrw.cgi
+++ b/html/cgi-bin/netovpnrw.cgi
@@ -59,7 +59,7 @@ if ( $querry[0] ne "" && $querry[0] ne "UNDEF"){
if(@vpns){
foreach (@vpns) {
&Header::openbox('100%', 'center', "$_ $Lang::tr{'graph'}");
- &Graphs::makegraphbox("netovpnrw.cgi",$_,"week");
+ &Graphs::makegraphbox("netovpnrw.cgi",$_, "day");
&Header::closebox();
}
}else{
diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi
index f843462..ddf4177 100755
--- a/html/cgi-bin/netovpnsrv.cgi
+++ b/html/cgi-bin/netovpnsrv.cgi
@@ -59,7 +59,7 @@ if ( $querry[0] ne ""){
if (@vpns){
foreach (@vpns) {
&Header::openbox('100%', 'center', "$_ $Lang::tr{'graph'}");
- &Graphs::makegraphbox("netovpnsrv.cgi",$_,"week");
+ &Graphs::makegraphbox("netovpnsrv.cgi",$_, "day");
&Header::closebox();
}
}else{
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2015-04-13 9:39 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150413093929.48FAB21AD0@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox