From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, core80, updated. 5b71042c5426855ee58a56d16d11a4cc5d0f5253
Date: Thu, 17 Jul 2014 16:04:37 +0200 [thread overview]
Message-ID: <20140717140437.D3F9B21001@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 31096 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, core80 has been updated
via 5b71042c5426855ee58a56d16d11a4cc5d0f5253 (commit)
via e055b1105a1251dc3862b599e86a691c20141728 (commit)
via 261624fb991083f07246e2d3d7a24b2d1ff18c35 (commit)
via 3a99677dd6d6251dbe1cc8b70f7e55957230ac29 (commit)
via ed94927d20eecaa83df3f71df5a0d937647965ef (commit)
via e3c3a6ba5bae10987336ce8170f1d0359c6e8efb (commit)
via d88845890c02924a3a7cd108451e763e52790749 (commit)
via a945fa225d9d128f889021c99f35a96809e33d27 (commit)
via b21618696d28c672ddd11f8943bf27d38d5996dc (commit)
via 903c6825aa0f1753b0d49786aba6fc3e7f195292 (commit)
via dfabfbedcaedab44714bfc9cbd7d464482c1e5ad (commit)
via 9c6be5543e82bd2f0a87d6c40e23b7b18f712806 (commit)
via 960e969ca105d3c9089658f3323121156c11da90 (commit)
via 4fb763ff6e70f9a1820fd5ef4479640403013209 (commit)
via a78470dc17d2f3bfb563ff58ebec1299f5a408cb (commit)
via ff5e4ef87194735870012f73ff998a7b4d8da4a9 (commit)
via 5b942f7f3b3fd5277ca990c22530ea5f0aa33876 (commit)
via c8b51e28bff7d3a5196a22e52de9e245d249807b (commit)
from e351c1e0905deea4fc65646952b7c621ebdb1c14 (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 5b71042c5426855ee58a56d16d11a4cc5d0f5253
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Jul 17 16:03:08 2014 +0200
cleanfs: repair /var/run symlink to /run if it not exist.
commit e055b1105a1251dc3862b599e86a691c20141728
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Jul 17 15:54:35 2014 +0200
rootfiles: remove /var/run/... from packages.
this will destroy a symlink to /run and is a ramdisk so
content is removed on every boot and it make no sense to
package it.
commit 261624fb991083f07246e2d3d7a24b2d1ff18c35
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Jul 17 06:59:37 2014 +0200
checkwronglinks: add a check for var/run/* in rootfiles.
commit 3a99677dd6d6251dbe1cc8b70f7e55957230ac29
Merge: ed94927 b216186
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Jul 16 23:25:20 2014 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
commit ed94927d20eecaa83df3f71df5a0d937647965ef
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Jul 16 23:25:06 2014 +0200
netexternal.cgi: Fix font colour on yellow background.
commit e3c3a6ba5bae10987336ce8170f1d0359c6e8efb
Merge: d888458 a945fa2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Jul 16 20:58:41 2014 +0200
Merge remote-tracking branch 'morlix/check_mk'
commit d88845890c02924a3a7cd108451e763e52790749
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Jul 16 20:54:56 2014 +0200
core80: Add proxy.cgi.
commit a945fa225d9d128f889021c99f35a96809e33d27
Author: Timo Eissler <timo(a)eissler.pro>
Date: Wed Jul 16 17:27:01 2014 +0200
check_mk_agent: fix DL_FROM
commit b21618696d28c672ddd11f8943bf27d38d5996dc
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Jul 16 17:26:14 2014 +0200
webif: hide main-menu if gpl was not accepted.
commit 903c6825aa0f1753b0d49786aba6fc3e7f195292
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Jul 16 17:24:41 2014 +0200
core80: add proxy.cgi to update.
commit dfabfbedcaedab44714bfc9cbd7d464482c1e5ad
Author: Timo Eissler <timo(a)eissler.pro>
Date: Tue Jul 15 20:45:02 2014 +0200
check_mk_agent: increase PAK_VER
commit 9c6be5543e82bd2f0a87d6c40e23b7b18f712806
Author: Timo Eissler <timo(a)eissler.pro>
Date: Tue Jul 15 20:36:23 2014 +0200
check_mk_agent: update to 1.2.4p5
commit 960e969ca105d3c9089658f3323121156c11da90
Merge: a78470d 4fb763f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Jul 14 14:12:31 2014 +0200
Merge remote-tracking branch 'stevee/ddns-new-providers'
commit 4fb763ff6e70f9a1820fd5ef4479640403013209
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Mon Jul 14 14:09:23 2014 +0200
ddns.cgi: Add handling for entrydns and opendns.
commit a78470dc17d2f3bfb563ff58ebec1299f5a408cb
Merge: ff5e4ef 5b942f7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Jul 14 14:02:57 2014 +0200
Merge remote-tracking branch 'amarx/openvpn'
commit ff5e4ef87194735870012f73ff998a7b4d8da4a9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Jul 14 13:42:24 2014 +0200
netexternal.cgi: Show DNSSEC status
The netexternal.cgi has been extended to show what type
of DNSSEC support the upstream nameservers offer.
commit 5b942f7f3b3fd5277ca990c22530ea5f0aa33876
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date: Mon Jul 14 10:29:24 2014 +0200
OpenVPN: change sortorder of client status and control. Now every network is sorted and displayed in a group
commit c8b51e28bff7d3a5196a22e52de9e245d249807b
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date: Thu Jul 10 08:08:01 2014 +0200
Openvpn: Change sortorder of client status and control
Now every NET is sorted and second instance is the NAME of the VPN.
-----------------------------------------------------------------------
Summary of changes:
config/cfgroot/header.pl | 3 +
config/rootfiles/core/80/filelists/files | 4 ++
config/rootfiles/packages/asterisk | 2 +-
config/rootfiles/packages/clamav | 2 +-
config/rootfiles/packages/cups | 4 +-
config/rootfiles/packages/dbus | 2 +-
config/rootfiles/packages/mysql | 2 +-
config/rootfiles/packages/vdradmin | 2 +-
doc/language_issues.es | 5 ++
doc/language_issues.fr | 5 ++
doc/language_issues.nl | 5 ++
doc/language_issues.pl | 5 ++
doc/language_issues.ru | 5 ++
doc/language_issues.tr | 5 ++
doc/language_missings | 20 ++++++
html/cgi-bin/ddns.cgi | 4 +-
html/cgi-bin/netexternal.cgi | 111 ++++++++++++++++++++++++++++++-
html/cgi-bin/ovpnmain.cgi | 50 +++++++++-----
langs/de/cgi-bin/de.pl | 5 ++
langs/en/cgi-bin/en.pl | 5 ++
lfs/check_mk_agent | 8 +--
src/initscripts/init.d/cleanfs | 7 ++
tools/checkwronginitlinks | 7 ++
23 files changed, 237 insertions(+), 31 deletions(-)
Difference in files:
diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index d90086d..acccfc8 100644
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -142,6 +142,8 @@ sub genmenu {
my %sublogshash = ();
my $sublogs = \%sublogshash;
+ if ( -e "/var/ipfire/main/gpl_accepted") {
+
eval `/bin/cat /var/ipfire/menu.d/*.menu`;
eval `/bin/cat /var/ipfire/menu.d/*.main`;
@@ -159,6 +161,7 @@ sub genmenu {
if ( $ethsettings{'RED_TYPE'} eq "PPPOE" && $pppsettings{'MONPORT'} ne "" ) {
$menu->{'02.status'}{'subMenu'}->{'74.modem-status'}{'enabled'} = 1;
}
+ }
}
sub showhttpheaders
diff --git a/config/rootfiles/core/80/filelists/files b/config/rootfiles/core/80/filelists/files
index 8ece4f8..822baa2 100644
--- a/config/rootfiles/core/80/filelists/files
+++ b/config/rootfiles/core/80/filelists/files
@@ -1,13 +1,17 @@
etc/system-release
etc/issue
etc/logrotate.conf
+etc/rc.d/init.d/cleanfs
etc/rc.d/init.d/dhcrelay
etc/rc.d/init.d/dnsmasq
etc/rc.d/init.d/networking/red.up/30-ddns
srv/web/ipfire/cgi-bin/ddns.cgi
srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat
+srv/web/ipfire/cgi-bin/netexternal.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
+srv/web/ipfire/cgi-bin/proxy.cgi
srv/web/ipfire/cgi-bin/routing.cgi
usr/sbin/dhcrelay
var/ipfire/general-functions.pl
+var/ipfire/header.pl
var/ipfire/langs
diff --git a/config/rootfiles/packages/asterisk b/config/rootfiles/packages/asterisk
index f7b6cde..1b0eb9d 100644
--- a/config/rootfiles/packages/asterisk
+++ b/config/rootfiles/packages/asterisk
@@ -2706,7 +2706,7 @@ var/lib/asterisk/static-http/prototype.js
var/log/asterisk/cdr-csv
var/log/asterisk/cdr-custom
var/log/asterisk/cel-custom
-var/run/asterisk
+#var/run/asterisk
#var/spool/asterisk
var/spool/asterisk/dictate
var/spool/asterisk/meetme
diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav
index c2aee7c..f3afd6b 100644
--- a/config/rootfiles/packages/clamav
+++ b/config/rootfiles/packages/clamav
@@ -41,6 +41,6 @@ var/ipfire/clamav/clamd.conf
var/ipfire/clamav/clamd.conf.sample
var/ipfire/clamav/freshclam.conf
var/ipfire/clamav/freshclam.conf.sample
-var/run/clamav
+#var/run/clamav
etc/rc.d/init.d/clamav
usr/local/bin/clamavctrl
diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups
index 3acbcac..56ee1f2 100644
--- a/config/rootfiles/packages/cups
+++ b/config/rootfiles/packages/cups
@@ -936,7 +936,7 @@ var/ipfire/cups/ppd
var/ipfire/cups/snmp.conf
var/ipfire/cups/ssl
var/log/cups
-var/run/cups
-var/run/cups/certs
+#var/run/cups
+#var/run/cups/certs
var/spool/cups
var/spool/cups/tmp
diff --git a/config/rootfiles/packages/dbus b/config/rootfiles/packages/dbus
index 2d31a13..b252653 100644
--- a/config/rootfiles/packages/dbus
+++ b/config/rootfiles/packages/dbus
@@ -50,4 +50,4 @@ usr/share/dbus-1/services
#usr/share/man/man1/dbus-send.1
#usr/share/man/man1/dbus-uuidgen.1
var/lib/dbus
-var/run/dbus
+#var/run/dbus
diff --git a/config/rootfiles/packages/mysql b/config/rootfiles/packages/mysql
index 0beaca8..8f1414a 100644
--- a/config/rootfiles/packages/mysql
+++ b/config/rootfiles/packages/mysql
@@ -300,4 +300,4 @@ usr/share/mysql
#usr/share/mysql/ukrainian
#usr/share/mysql/ukrainian/errmsg.sys
var/ipfire/backup/addons/includes/mysql
-var/run/mysql
+#var/run/mysql
diff --git a/config/rootfiles/packages/vdradmin b/config/rootfiles/packages/vdradmin
index 20ea7d5..3dba2a0 100644
--- a/config/rootfiles/packages/vdradmin
+++ b/config/rootfiles/packages/vdradmin
@@ -182,4 +182,4 @@ etc/rc.d/rc3.d/S99vdradmin
#usr/share/locale/en_US.utf8/LC_MESSAGES/vdradmin.mo
var/cache/vdradmin
var/log/vdradmin
-var/run/vdradmin
+#var/run/vdradmin
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 11e11d1..1176883 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -663,6 +663,10 @@ WARNING: untranslated string: dnsforward edit an entry
WARNING: untranslated string: dnsforward entries
WARNING: untranslated string: dnsforward forward_server
WARNING: untranslated string: dnsforward zone
+WARNING: untranslated string: dnssec aware
+WARNING: untranslated string: dnssec information
+WARNING: untranslated string: dnssec not supported
+WARNING: untranslated string: dnssec validating
WARNING: untranslated string: downlink
WARNING: untranslated string: download tls-auth key
WARNING: untranslated string: dpd delay
@@ -874,6 +878,7 @@ WARNING: untranslated string: modem sim information
WARNING: untranslated string: modem status
WARNING: untranslated string: monitor interface
WARNING: untranslated string: most preferred
+WARNING: untranslated string: nameserver
WARNING: untranslated string: no hardware random number generator
WARNING: untranslated string: not a valid dh key
WARNING: untranslated string: notice
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index e93eeb0..beca008 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -674,6 +674,10 @@ WARNING: untranslated string: dnsforward edit an entry
WARNING: untranslated string: dnsforward entries
WARNING: untranslated string: dnsforward forward_server
WARNING: untranslated string: dnsforward zone
+WARNING: untranslated string: dnssec aware
+WARNING: untranslated string: dnssec information
+WARNING: untranslated string: dnssec not supported
+WARNING: untranslated string: dnssec validating
WARNING: untranslated string: downlink
WARNING: untranslated string: download tls-auth key
WARNING: untranslated string: dpd delay
@@ -885,6 +889,7 @@ WARNING: untranslated string: modem sim information
WARNING: untranslated string: modem status
WARNING: untranslated string: monitor interface
WARNING: untranslated string: most preferred
+WARNING: untranslated string: nameserver
WARNING: untranslated string: no hardware random number generator
WARNING: untranslated string: not a valid dh key
WARNING: untranslated string: notice
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index ce44d14..6162636 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -671,6 +671,10 @@ WARNING: untranslated string: dh key warn
WARNING: untranslated string: dh key warn1
WARNING: untranslated string: dh parameter
WARNING: untranslated string: dns servers
+WARNING: untranslated string: dnssec aware
+WARNING: untranslated string: dnssec information
+WARNING: untranslated string: dnssec not supported
+WARNING: untranslated string: dnssec validating
WARNING: untranslated string: download tls-auth key
WARNING: untranslated string: drop outgoing
WARNING: untranslated string: firewall logs country
@@ -693,6 +697,7 @@ WARNING: untranslated string: modem no connection message
WARNING: untranslated string: modem sim information
WARNING: untranslated string: modem status
WARNING: untranslated string: monitor interface
+WARNING: untranslated string: nameserver
WARNING: untranslated string: not a valid dh key
WARNING: untranslated string: ovpn crypt options
WARNING: untranslated string: ovpn dh
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 11e11d1..1176883 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -663,6 +663,10 @@ WARNING: untranslated string: dnsforward edit an entry
WARNING: untranslated string: dnsforward entries
WARNING: untranslated string: dnsforward forward_server
WARNING: untranslated string: dnsforward zone
+WARNING: untranslated string: dnssec aware
+WARNING: untranslated string: dnssec information
+WARNING: untranslated string: dnssec not supported
+WARNING: untranslated string: dnssec validating
WARNING: untranslated string: downlink
WARNING: untranslated string: download tls-auth key
WARNING: untranslated string: dpd delay
@@ -874,6 +878,7 @@ WARNING: untranslated string: modem sim information
WARNING: untranslated string: modem status
WARNING: untranslated string: monitor interface
WARNING: untranslated string: most preferred
+WARNING: untranslated string: nameserver
WARNING: untranslated string: no hardware random number generator
WARNING: untranslated string: not a valid dh key
WARNING: untranslated string: notice
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 1cea7f3..547e1d4 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -668,6 +668,10 @@ WARNING: untranslated string: dnsforward edit an entry
WARNING: untranslated string: dnsforward entries
WARNING: untranslated string: dnsforward forward_server
WARNING: untranslated string: dnsforward zone
+WARNING: untranslated string: dnssec aware
+WARNING: untranslated string: dnssec information
+WARNING: untranslated string: dnssec not supported
+WARNING: untranslated string: dnssec validating
WARNING: untranslated string: downlink
WARNING: untranslated string: download tls-auth key
WARNING: untranslated string: dpd delay
@@ -870,6 +874,7 @@ WARNING: untranslated string: modem sim information
WARNING: untranslated string: modem status
WARNING: untranslated string: monitor interface
WARNING: untranslated string: most preferred
+WARNING: untranslated string: nameserver
WARNING: untranslated string: no hardware random number generator
WARNING: untranslated string: not a valid dh key
WARNING: untranslated string: notice
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 2843d53..cc40178 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -672,6 +672,10 @@ WARNING: untranslated string: dh key move failed
WARNING: untranslated string: dh key warn
WARNING: untranslated string: dh key warn1
WARNING: untranslated string: dh parameter
+WARNING: untranslated string: dnssec aware
+WARNING: untranslated string: dnssec information
+WARNING: untranslated string: dnssec not supported
+WARNING: untranslated string: dnssec validating
WARNING: untranslated string: download tls-auth key
WARNING: untranslated string: firewall logs country
WARNING: untranslated string: fwhost err hostip
@@ -693,6 +697,7 @@ WARNING: untranslated string: modem no connection message
WARNING: untranslated string: modem sim information
WARNING: untranslated string: modem status
WARNING: untranslated string: monitor interface
+WARNING: untranslated string: nameserver
WARNING: untranslated string: not a valid dh key
WARNING: untranslated string: ovpn crypt options
WARNING: untranslated string: ovpn dh
diff --git a/doc/language_missings b/doc/language_missings
index 69cd218..4699f12 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -94,6 +94,10 @@
< dnsforward entries
< dnsforward forward_server
< dnsforward zone
+< dnssec aware
+< dnssec information
+< dnssec not supported
+< dnssec validating
< dns servers
< downlink
< download dh parameter
@@ -351,6 +355,7 @@
< monitor interface
< most preferred
< MTU settings
+< nameserver
< never
< no hardware random number generator
< not a valid dh key
@@ -620,6 +625,10 @@
< dnsforward entries
< dnsforward forward_server
< dnsforward zone
+< dnssec aware
+< dnssec information
+< dnssec not supported
+< dnssec validating
< dns servers
< downlink
< download dh parameter
@@ -877,6 +886,7 @@
< monitor interface
< most preferred
< MTU settings
+< nameserver
< never
< no hardware random number generator
< not a valid dh key
@@ -1138,6 +1148,10 @@
< dnsforward entries
< dnsforward forward_server
< dnsforward zone
+< dnssec aware
+< dnssec information
+< dnssec not supported
+< dnssec validating
< dns servers
< downlink
< download dh parameter
@@ -1387,6 +1401,7 @@
< monitor interface
< most preferred
< MTU settings
+< nameserver
< never
< no hardware random number generator
< not a valid dh key
@@ -1635,6 +1650,10 @@
< dnsforward entries
< dnsforward forward_server
< dnsforward zone
+< dnssec aware
+< dnssec information
+< dnssec not supported
+< dnssec validating
< dns servers
< downlink
< download dh parameter
@@ -1889,6 +1908,7 @@
< month-graph
< most preferred
< MTU settings
+< nameserver
< never
< no hardware random number generator
< not a valid dh key
diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi
index 6bee9c6..7be9a50 100644
--- a/html/cgi-bin/ddns.cgi
+++ b/html/cgi-bin/ddns.cgi
@@ -647,7 +647,7 @@ sub GenerateDDNSConfigFile {
my $use_token = 0;
# Handle token based auth for various providers.
- if ($provider ~~ ["dns.lightningwirelabs.com", "regfish.com"] && $username eq "token") {
+ if ($provider ~~ ["dns.lightningwirelabs.com", "entrydns.net", "regfish.com"] && $username eq "token") {
$use_token = 1;
# Handle token auth for freedns.afraid.org.
@@ -680,7 +680,7 @@ sub GenerateDDNSConfigFile {
}
# These providers need to be set to only use IPv4.
- if ($provider ~~ ["freedns.afraid.org", "nsupdate.info", "variomedia.de", "zoneedit.com"]) {
+ if ($provider ~~ ["freedns.afraid.org", "nsupdate.info", "opendns.com", "variomedia.de", "zoneedit.com"]) {
print FILE "proto = ipv4\n";
}
diff --git a/html/cgi-bin/netexternal.cgi b/html/cgi-bin/netexternal.cgi
index 156ef24..299612d 100644
--- a/html/cgi-bin/netexternal.cgi
+++ b/html/cgi-bin/netexternal.cgi
@@ -76,6 +76,86 @@ if ( $querry[0] ne~ ""){
&Header::closebox();
}
+ ## DNSSEC
+ my @nameservers = ();
+ foreach my $f ("${General::swroot}/red/dns1", "${General::swroot}/red/dns2") {
+ open(DNS, "<$f");
+ my $nameserver = <DNS>;
+ close(DNS);
+
+ chomp($nameserver);
+ if ($nameserver) {
+ push(@nameservers, $nameserver);
+ }
+ }
+
+ &Header::openbox('100%', 'center', $Lang::tr{'dnssec information'});
+
+ print <<END;
+ <table class="tbl" width='66%'>
+ <thead>
+ <tr>
+ <th align="center">
+ <strong>$Lang::tr{'nameserver'}</strong>
+ </th>
+ <th align="center">
+ <strong>$Lang::tr{'status'}</strong>
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+END
+
+ my $id = 0;
+ for my $nameserver (@nameservers) {
+ my $status = &check_dnssec($nameserver, "ping.ipfire.org");
+
+ my $colour = "";
+ my $bgcolour = "";
+ my $message = "";
+
+ # DNSSEC Not supported
+ if ($status == 0) {
+ $message = $Lang::tr{'dnssec not supported'};
+ $colour = "white";
+ $bgcolour = ${Header::colourred};
+
+ # DNSSEC Aware
+ } elsif ($status == 1) {
+ $message = $Lang::tr{'dnssec aware'};
+ $colour = "black";
+ $bgcolour = ${Header::colouryellow};
+
+ # DNSSEC Validating
+ } elsif ($status == 2) {
+ $message = $Lang::tr{'dnssec validating'};
+ $colour = "white";
+ $bgcolour = ${Header::colourgreen};
+
+ # Error
+ } else {
+ $colour = ${Header::colourred};
+ }
+
+ my $table_colour = ($id++ % 2) ? $color{'color22'} : $color{'color20'};
+
+ print <<END;
+ <tr bgcolor="$table_colour">
+ <td>$nameserver</td>
+ <td bgcolor="$bgcolour" align="center">
+ <font color="$colour"><strong>$message</strong></font>
+ </td>
+ </tr>
+END
+ }
+
+ print <<END;
+ </tbody>
+ </table>
+END
+
+ &Header::closebox();
+
if ( $netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && $netsettings{'RED_TYPE'} eq "DHCP"){
&Header::openbox('100%', 'left', "RED $Lang::tr{'dhcp configuration'}");
@@ -161,4 +241,33 @@ END
&Header::closebigbox();
&Header::closepage();
-}
+}
+
+sub check_dnssec($$) {
+ my $nameserver = shift;
+ my $record = shift;
+
+ my @command = ("dig", "+dnssec", $record, "\@$nameserver");
+
+ my @output = qx(@command);
+ my $output = join("", @output);
+
+ my $status = 0;
+ if ($output =~ m/status: (\w+)/) {
+ $status = ($1 eq "NOERROR");
+
+ if (!$status) {
+ return -1;
+ }
+ }
+
+ my @flags = ();
+ if ($output =~ m/flags: (.*);/) {
+ @flags = split(/ /, $1);
+ }
+
+ my $aware = ($output =~ m/RRSIG/);
+ my $validating = ("ad" ~~ @flags);
+
+ return $aware + $validating;
+}
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 0cb4169..927616a 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -5024,24 +5024,41 @@ END
###
&Header::openbox('100%', 'LEFT', $Lang::tr{'connection status and controlc' });
- print <<END;
-
-
- <table width='100%' cellspacing='1' cellpadding='0' class='tbl'>
-<tr>
- <th width='10%' class='boldbase' align='center'><b>$Lang::tr{'name'}</b></th>
- <th width='15%' class='boldbase' align='center'><b>$Lang::tr{'type'}</b></th>
- <th width='22%' class='boldbase' align='center'><b>$Lang::tr{'network'}</b></th>
- <th width='20%' class='boldbase' align='center'><b>$Lang::tr{'remark'}</b></th>
- <th width='10%' class='boldbase' align='center'><b>$Lang::tr{'status'}</b></th>
- <th width='5%' class='boldbase' colspan='6' align='center'><b>$Lang::tr{'action'}</b></th>
-</tr>
-END
;
my $id = 0;
my $gif;
my $col1="";
- foreach my $key (sort { ncmp ($confighash{$a}[3],$confighash{$b}[3]) } sort { ncmp ($confighash{$a}[1],$confighash{$b}[1]) } keys %confighash) {
+ my $lastnet;
+ foreach my $key (sort { ncmp ($confighash{$a}[32],$confighash{$b}[32]) } sort { ncmp ($confighash{$a}[1],$confighash{$b}[1]) } keys %confighash) {
+ if ($confighash{$key}[32] eq "" && $confighash{$key}[3] eq 'net' ){$confighash{$key}[32]=$Lang::tr{'fwhost OpenVPN N-2-N'};}
+ if ($confighash{$key}[32] eq "dynamic"){$confighash{$key}[32]=$Lang::tr{'ccd dynrange'};}
+ if($id == 0){
+ print"<b>$confighash{$key}[32]</b>";
+ print <<END;
+ <table width='100%' cellspacing='1' cellpadding='0' class='tbl'>
+<tr>
+ <th width='10%' class='boldbase' align='center'><b>$Lang::tr{'name'}</b></th>
+ <th width='15%' class='boldbase' align='center'><b>$Lang::tr{'type'}</b></th>
+ <th width='20%' class='boldbase' align='center'><b>$Lang::tr{'remark'}</b></th>
+ <th width='10%' class='boldbase' align='center'><b>$Lang::tr{'status'}</b></th>
+ <th width='5%' class='boldbase' colspan='6' align='center'><b>$Lang::tr{'action'}</b></th>
+</tr>
+END
+ }
+ if ($id > 0 && $lastnet ne $confighash{$key}[32]){
+ print "</table><br>";
+ print"<b>$confighash{$key}[32]</b>";
+ print <<END;
+ <table width='100%' cellspacing='1' cellpadding='0' class='tbl'>
+<tr>
+ <th width='10%' class='boldbase' align='center'><b>$Lang::tr{'name'}</b></th>
+ <th width='15%' class='boldbase' align='center'><b>$Lang::tr{'type'}</b></th>
+ <th width='20%' class='boldbase' align='center'><b>$Lang::tr{'remark'}</b></th>
+ <th width='10%' class='boldbase' align='center'><b>$Lang::tr{'status'}</b></th>
+ <th width='5%' class='boldbase' colspan='6' align='center'><b>$Lang::tr{'action'}</b></th>
+</tr>
+END
+ }
if ($confighash{$key}[0] eq 'on') { $gif = 'on.gif'; } else { $gif = 'off.gif'; }
if ($id % 2) {
print "<tr>";
@@ -5060,9 +5077,6 @@ END
my $cavalid = `/usr/bin/openssl x509 -text -in ${General::swroot}/ovpn/certs/$confighash{$key}[1]cert.pem`;
$cavalid =~ /Not After : (.*)[\n]/;
$cavalid = $1;
- if ($confighash{$key}[32] eq "" && $confighash{$key}[3] eq 'net' ){$confighash{$key}[32]="net-2-net";}
- if ($confighash{$key}[32] eq "" && $confighash{$key}[3] eq 'host' ){$confighash{$key}[32]="dynamic";}
- print "<td align='center' $col>$confighash{$key}[32]</td>";
print "<td align='center' $col>$confighash{$key}[25]</td>";
$col1="bgcolor='${Header::colourred}'";
my $active = "<b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b>";
@@ -5191,7 +5205,9 @@ END
END
;
$id++;
+ $lastnet = $confighash{$key}[32];
}
+ print"</table>";
;
# If the config file contains entries, print Key to action icons
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 86d365f..556e65c 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -750,6 +750,10 @@
'dnsforward entries' => 'Aktuelle Einträge',
'dnsforward forward_server' => 'DNS-Server',
'dnsforward zone' => 'Zone',
+'dnssec aware' => 'DNSSEC-aware',
+'dnssec information' => 'DNSSEC-Informationen',
+'dnssec not supported' => 'DNSSEC wird nicht unterstützt',
+'dnssec validating' => 'DNSSEC-validierend',
'do not log this port list' => 'Verwerfe diese Port-Liste kurz bevor sie protokolliert werden (reduziert Protokollgröße)',
'dod' => 'Dial-on-Demand-Modus',
'dod for dns' => 'Dial-on-Demand für DNS:',
@@ -1523,6 +1527,7 @@
'name is invalid' => 'Name ist ungültig',
'name must only contain characters' => 'Name darf nur Buchstaben enthalten.',
'name too long' => 'Der volle Benutzername oder der System Hostname ist zu lang',
+'nameserver' => 'Nameserver',
'nat-traversal' => 'Nat Traversal:',
'needreboot' => 'Ein Update benötigt einen Neustart',
'net' => 'Netz',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 085dd3f..f4fafca 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -775,6 +775,10 @@
'dnsforward entries' => 'Current entries',
'dnsforward forward_server' => 'Nameserver',
'dnsforward zone' => 'Zone',
+'dnssec aware' => 'DNSSEC Aware',
+'dnssec information' => 'DNSSEC Information',
+'dnssec not supported' => 'DNSSEC Not supported',
+'dnssec validating' => 'DNSSEC Validating',
'do not log this port list' => 'Drop this port list just before they are logged (reduces log size)',
'dod' => 'Dial on Demand',
'dod for dns' => 'Dial on Demand for DNS:',
@@ -1553,6 +1557,7 @@
'name is invalid' => 'Name is invalid',
'name must only contain characters' => 'Name must only contain characters.',
'name too long' => 'User\'s full name or system hostname is too long',
+'nameserver' => 'Nameserver',
'nat-traversal' => 'Nat Traversal:',
'needreboot' => 'An update requires a restart',
'net' => 'Net',
diff --git a/lfs/check_mk_agent b/lfs/check_mk_agent
index 6e6d557..541d7d6 100644
--- a/lfs/check_mk_agent
+++ b/lfs/check_mk_agent
@@ -24,15 +24,15 @@
include Config
-VER = 1.2.2p2
+VER = 1.2.4p5
THISAPP = check_mk_agent-$(VER)
DL_FILE = check_mk-${VER}.tar.gz
-DL_FROM = http://mathias-kettner.de/download
+DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/check_mk-${VER}
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = check_mk_agent
-PAK_VER = 2
+PAK_VER = 3
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = caa0f7662b4d170b2b6db2516bd41a89
+$(DL_FILE)_MD5 = ef3055d191bd38295d1716b3f7824115
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
diff --git a/src/initscripts/init.d/cleanfs b/src/initscripts/init.d/cleanfs
index d526c35..e8c8c8b 100644
--- a/src/initscripts/init.d/cleanfs
+++ b/src/initscripts/init.d/cleanfs
@@ -71,6 +71,13 @@ create_files() {
case "${1}" in
start)
+ if [[ ! -L "/var/run" ]]; then
+ boot_mesg "Repair /var/run symlink to /run..."
+ mv -u /var/run/* /run/ 2>&1 > /dev/null
+ rm -rf /var/run
+ ln -s ../run /var/run
+ fi
+
boot_mesg -n "Cleaning file systems:" ${INFO}
boot_mesg -n " /tmp" ${NORMAL}
diff --git a/tools/checkwronginitlinks b/tools/checkwronginitlinks
index 6f001c0..65fc946 100755
--- a/tools/checkwronginitlinks
+++ b/tools/checkwronginitlinks
@@ -25,3 +25,10 @@ if [ "${?}" == "0" ]; then
grep -r "^etc/init.d//*" ./config/rootfiles/
echo "Change this to 'etc/rc.d/init.d/...' !"
fi
+
+grep -r "^var/run//*" ./config/rootfiles/ >/dev/null 2>&1
+if [ "${?}" == "0" ]; then
+ echo "Error! 'var/run/...' in rootfiles files found!"
+ grep -r "^var/run//*" ./config/rootfiles/
+ echo "Comment this and create it at initskript if needed !"
+fi
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2014-07-17 14:04 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=20140717140437.D3F9B21001@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