entrouvert
/
univnautes
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'RELENG_2_1' into UNIVNAUTES_2_1

This commit is contained in:
Thomas NOËL 2014-10-29 15:54:56 +01:00
parent beead36d26 70eef83536
commit f9299058d1
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
etc/inc/system.inc
View File

@ -826,14 +826,10 @@ function system_webgui_start() {
if ($config['system']['webgui']['protocol'] == "https") {
// Ensure that we have a webConfigurator CERT
$cert =& lookup_cert($config['system']['webgui']['ssl-certref']);
if(!is_array($cert) && !$cert['crt'] && !$cert['prv']) {
if(!is_array($cert) || !$cert['crt'] || !$cert['prv'])
$cert = system_webgui_create_certificate();
$crt = $cert['crt'];
$key = $cert['prv'];
} else {
$crt = base64_decode($cert['crt']);
$key = base64_decode($cert['prv']);
}
$crt = base64_decode($cert['crt']);
$key = base64_decode($cert['prv']);
if(!$config['system']['webgui']['port'])
$portarg = "443";

2
usr/local/bin/ping_hosts.sh
View File

@ -40,7 +40,7 @@ if [ -f /var/db/pkgpinghosts ]; then
PKGHOSTS="/var/db/pkgpinghosts"
fi
cat $PKGHOSTS $HOSTS $IPSECHOSTS >/tmp/tmpHOSTS
cat $PKGHOSTS $HOSTS $CURRENTIPSECHOSTS >/tmp/tmpHOSTS
if [ ! -d /var/db/pingstatus ]; then
/bin/mkdir -p /var/db/pingstatus