From patchwork Tue Sep 3 20:45:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Feddersen X-Patchwork-Id: 2388 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 46NJrX071Vz4252 for ; Tue, 3 Sep 2019 20:46:03 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 46NJrR4rKHz3pF; Tue, 3 Sep 2019 20:45:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1567543561; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=KWOXN7doMUrRyzpeCFXVfUs1Z1IrvfU5cq+IKGwnngw=; b=LgHWEdEhg70EiQ7+eog0wKW0MbyrOQ504YVtt2XvkgzkYi7V44HCD+BwjHwLFXpuLXy+C1 HbZRgcPP+7qyhEYxLDrKP4aFVYU0ln/phRiMP2lmnJliB83dzXRg81vQzMmdrfT9mePI9l HOf4qPw83dpxNzoyO1aNSIKSDqssmFlxS2bbplVUJR1azEyIcxQ5F3lxeXigsEVAwAH7Nn LOBKMRnoeCK0ZGMAhy31MWcfo6TyQV6DOkzcCInHM1oZOxnlCWAjdpAGSvAy56QWUUf7tQ QugdpI4ikwapSk87emezhi7us8/ZZdlJ6diWyzVKcxwk42pARxJnFLuGBt2Xbw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1567543561; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=KWOXN7doMUrRyzpeCFXVfUs1Z1IrvfU5cq+IKGwnngw=; b=K4Uq9te8Yy40EqULSOF10m/WuFwx+CGnHPaMjjo0EA2/30IyDH//87ne4bWzgFHJ9pCByP LLRON+0WbGTSdMDg== Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 46NJrR2BCYz2ycq; Tue, 3 Sep 2019 20:45:59 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 46NJrP04hxz2ycq for ; Tue, 3 Sep 2019 20:45:56 +0000 (UTC) Received: from ubuntu.stflan.home (p5784D40F.dip0.t-ipconnect.de [87.132.212.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 46NJrN3FR9z3nD; Tue, 3 Sep 2019 20:45:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1567543556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=KWOXN7doMUrRyzpeCFXVfUs1Z1IrvfU5cq+IKGwnngw=; b=X9QYNLG1JOwgBosNFEi5jb8KGk2FJhzPkdPYOkDeYeS+PHE1vL3DYB/EnDnb5JBytgyV70 DDs2bNJMz6rfLD0yASAMdPRnJPiKf300wcBdkh+39AqPZ4+JSEGMpoLgeM5rBUm3DMQYBA DyiWLe9G4hp+/Hkn+mpxz8H6uuIWaBU51LD1AdEp/c5+rdnNTlU0FDO3n0kW9WI7XMe/MZ do69Jl4z+oadSTMlMbXY2BtRuVG2SPww1CPYk5+J2OU/tEcugXki7+pNDRnd0GUdWM3iy8 J2xtcEuOR07NhI7O1H60YUv2brawbGMr8EUvydqFwBs8J7ETynAC+FFbg3iG8g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1567543556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=KWOXN7doMUrRyzpeCFXVfUs1Z1IrvfU5cq+IKGwnngw=; b=q6QHT2A2hsD4Ldv09t8RyH8GOaHrzd4dMR9ZgrjxRpkujZkDOw1cYR5j+PMeyjate2J12c wJsIdtxOxNue1cDQ== From: sfeddersen To: development@lists.ipfire.org Subject: [PATCH 1/5] BUG12156: changed wio.cgi to fix broken Web GUI Date: Tue, 3 Sep 2019 22:45:44 +0200 Message-Id: <20190903204548.2045-1-sfeddersen@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=sfeddersen smtp.mailfrom=sfeddersen@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: sfeddersen Errors-To: development-bounces@lists.ipfire.org Sender: "Development" --- src/wio/wio.cgi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/wio/wio.cgi b/src/wio/wio.cgi index c51910f4d..1645aa54e 100644 --- a/src/wio/wio.cgi +++ b/src/wio/wio.cgi @@ -1504,7 +1504,7 @@ my $dotip = length($ipaddresses[$a]) - rindex($ipaddresses[$a],'.'); $ic = "${_}"; foreach $interface (@devs_net) { - next if ( $netsettings{"$ic"."_DEV"} eq 'red0' && ($netsettings{"RED_TYPE"} eq 'DHCP' || $netsettings{"RED_TYPE"} eq 'PPPOE')); + next if ( $netsettings{"$ic"."_DEV"} eq 'red0' && $netsettings{"RED_TYPE"} eq 'PPPOE'); if ( $netsettings{"$ic"."_DEV"} eq $interface ) { if ( &General::IpInSubnet($ipaddresses[$a], $netsettings{"$ic"."_NETADDRESS"}, $netsettings{"$ic"."_NETMASK"}) ) { print"$Lang::tr{$devs_alt[$in]}"; @@ -1558,7 +1558,7 @@ my $dotip = length($ipaddresses[$a]) - rindex($ipaddresses[$a],'.'); } } - if ($netsettings{"RED_TYPE"} eq 'DHCP' || $netsettings{"RED_TYPE"} eq 'PPPOE') { + if ( $netsettings{"RED_TYPE"} eq 'PPPOE' ) { my $redipadr = qx'ip addr | grep red0 | grep inet | awk "{print \$2}"'; my @rednet = split ("/", $redipadr); chomp ($rednet[1]); @@ -1569,10 +1569,10 @@ my $dotip = length($ipaddresses[$a]) - rindex($ipaddresses[$a],'.'); print"$Lang::tr{"; last SWITCH; } - else { + } + else { print"$Lang::tr{"; last SWITCH; - } } } @@ -1872,7 +1872,7 @@ SWITCH: { } } - if ($netsettings{"RED_TYPE"} eq 'DHCP' || $netsettings{"RED_TYPE"} eq 'PPPOE') { + if ($netsettings{"RED_TYPE"} eq 'DHCP' || $netsettings{"RED_TYPE"} eq 'PPPOE' || $netsettings{"RED_TYPE"} eq 'STATIC') { my $redipadr = qx'ip addr | grep red0 | grep inet | awk "{print \$2}"'; my @rednet = split ("/", $redipadr); chomp ($rednet[1]); From patchwork Tue Sep 3 20:45:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Feddersen X-Patchwork-Id: 2389 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 46NJrZ6WQhz4252 for ; Tue, 3 Sep 2019 20:46:06 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 46NJrX5lqQz3pK; Tue, 3 Sep 2019 20:46:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1567543564; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=sTIexcHo1y8MfpJgWlTK6kxwyXKIWVHs1yu7/9PJSVs=; b=NTNJO2kxTeJMtVg7HkZitg3do18REup8tcAeSEO7E8slVUzUBD0kt5fzr3Rz7wbrYseDzq e3CqfIi90qZvOnCTwMDHIilzOM6pGWCAFaZYzGEiWPasJ7ZZ5rZv0GpblWze/h8hV7BS/N x4zQ9iVbMy5aLthttR4TH5yfmM7MgB12MKMSjUvc1buGzAtnCo9IDUaeng9/n21Q7uNfU/ 5qXp1r/ug/Y5VPtdhlPZ/5Y8e4czco4uBiKu06l7DU9O/JIW0Tu70ZKTUmHAND8J/4uZya b/0wuX1SDubwLuEtMr9MNO2Q1Ag2rnnt1Tis/nC050DWXqV2rTUc36niT7Yklw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1567543564; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=sTIexcHo1y8MfpJgWlTK6kxwyXKIWVHs1yu7/9PJSVs=; b=gTroCgMK5FqK2ygXoWMfq5cSnVXRAJ4XkiM1lmDVVYMBEPGwcJ6mx9yyC6Jyr2uFCgdHNK 9yTKhbsOZTXyM0Bw== Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 46NJrX4Hgyz2yjN; Tue, 3 Sep 2019 20:46:04 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 46NJrW5JQ0z2ycq for ; Tue, 3 Sep 2019 20:46:03 +0000 (UTC) Received: from ubuntu.stflan.home (p5784D40F.dip0.t-ipconnect.de [87.132.212.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 46NJrV1NlWz3pK; Tue, 3 Sep 2019 20:46:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1567543562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=sTIexcHo1y8MfpJgWlTK6kxwyXKIWVHs1yu7/9PJSVs=; b=Gzj0UIIGAmGBkCaMgY2SeNQIF2lyyZS36rK/KGV+Pk0/EtTaEbg+E4GNd75t5j/tGgr1ss SGBVcUZqgsB0ZVs1HO/wAc+ST8s5Rw6vuJh69EgKFfCqFkXal7HzLFue8qMfy6uO1sXYyZ H/fiVoz8qqQayQRwyo2z0b5sWZHKf7iIP3SJmw0GgN3Q0gu45xpD2fhzTir/96TjPC3M8A xFc0wDDj0OBibnX6mhihGkFDjlX8J/x+8yUzhUUIaUMW2mzFxp/nuv04yw1dRC28IN2WQr /1lI+Zvnu8BMJQ3RCIRF/um/BwMeSY9avKsEP/2CaUx/3/AtH22y6SuDq6Bqow== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1567543562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=sTIexcHo1y8MfpJgWlTK6kxwyXKIWVHs1yu7/9PJSVs=; b=fqi0CBPn8y0cRtuFBwJRpFBMVsr+BkbCYLFp3AMOYNEpo/HoF9ovnJ5Pz+snd0NRIbmUGe 2dPkMoqcnMVXn5Ag== From: sfeddersen To: development@lists.ipfire.org Subject: [PATCH 2/5] BUG12156: added wio rrd files to backup Date: Tue, 3 Sep 2019 22:45:45 +0200 Message-Id: <20190903204548.2045-2-sfeddersen@ipfire.org> In-Reply-To: <20190903204548.2045-1-sfeddersen@ipfire.org> References: <20190903204548.2045-1-sfeddersen@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=sfeddersen smtp.mailfrom=sfeddersen@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: sfeddersen Errors-To: development-bounces@lists.ipfire.org Sender: "Development" --- src/wio/config/backup/includes/wio | 1 + 1 file changed, 1 insertion(+) diff --git a/src/wio/config/backup/includes/wio b/src/wio/config/backup/includes/wio index 688b819d9..3c1853646 100644 --- a/src/wio/config/backup/includes/wio +++ b/src/wio/config/backup/includes/wio @@ -1,2 +1,3 @@ /var/ipfire/wio/wio.conf /var/log/wio +/var/log/rrd/wio/ From patchwork Tue Sep 3 20:45:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Feddersen X-Patchwork-Id: 2390 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 46NJrl4dncz4252 for ; Tue, 3 Sep 2019 20:46:15 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 46NJrl1H8qz3pP; Tue, 3 Sep 2019 20:46:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1567543575; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=hs7pQ/WVOqtNi8t6wbuY8+SN4ZH7OhV0TIMBphVc8EM=; b=ayHZuN6qaColz/3U88i2G7tuwTHBCSv7E7ylD3878dQqfY6y6E2GkxKpFmEZYcQxtywJ/O vHGmtAvzdrKMfxcrsd8tYTGi4v/4Q6fbN9GilVw/6FKoFUKpSfuyeUtdNQMouNHbjJtLpU e60jnY4ddLnDVXJao1ppv95wHZLObbvTcUNasxnLJuaqReKU6iBglOp32vzX8KP9Sqdhq3 /kFhk5qa/nXCzzWGVQCwroVDQMMKExysmBnNJNYPzwn2B8Yso7brWGzilgIOKiqQldt1pR 1cjeFExJq5f34GBPuXO1IynkpyJPaWzmPggRxa4wrsxfIDjLPrfpPhqxK5ng3w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1567543575; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=hs7pQ/WVOqtNi8t6wbuY8+SN4ZH7OhV0TIMBphVc8EM=; b=SWw8JLXZWbXhg8X9iNzHKJztLAkZyLRYqcKZMtZtJxliwQOdou5gud9vcPbq+DHb3EP82U jYIbVYtrde/A66DA== Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 46NJrk5txMz2yjJ; Tue, 3 Sep 2019 20:46:14 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 46NJrj4W0pz2ycq for ; Tue, 3 Sep 2019 20:46:13 +0000 (UTC) Received: from ubuntu.stflan.home (p5784D40F.dip0.t-ipconnect.de [87.132.212.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 46NJrj27mmz3nD; Tue, 3 Sep 2019 20:46:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1567543573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=hs7pQ/WVOqtNi8t6wbuY8+SN4ZH7OhV0TIMBphVc8EM=; b=DNSKyfOeYBzCPmUV+gBSxQq0mLBQhMu7zqrDKE17P2rGqwsMT916hCyxx/9ByFgH5Kp2qa Ue04Fywv8lGbN7KfwvlE3SUv1qEWtQ3Xqj9Dsd6UXzDCMF1m1oObOzc+XhhAVHXqIXisKf UJenJixZC+Qj8YT1HSJOgz7/SM6YoPOhqdQWXud7PdA3xRRFAuZkoquMaxa7LtwfacDOO9 JYFYBzUEdTKS3JNbmUnpZ20tXf3Wwv7br+OxI1vqDzJDwY7nu7KZeWZ7GVUR4/l1uD2XZl nM4D7WmKRwA3ALLgim+GMRYwq5AQcXe/Fk5pkewT4nnohiEmB1qT2ain/s8OwA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1567543573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=hs7pQ/WVOqtNi8t6wbuY8+SN4ZH7OhV0TIMBphVc8EM=; b=s+yZIVpRgOuCdNoDAqvMCgAL7ZQhzmDy3EVSxD7+7fhnSmOPfwyfIIZK8b5Gh04dHuKUPU bUmwqzDRdszhlUDg== From: sfeddersen To: development@lists.ipfire.org Subject: [PATCH 3/5] BUG12156: increased paket number Date: Tue, 3 Sep 2019 22:45:46 +0200 Message-Id: <20190903204548.2045-3-sfeddersen@ipfire.org> In-Reply-To: <20190903204548.2045-1-sfeddersen@ipfire.org> References: <20190903204548.2045-1-sfeddersen@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=sfeddersen smtp.mailfrom=sfeddersen@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: sfeddersen Errors-To: development-bounces@lists.ipfire.org Sender: "Development" --- lfs/wio | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfs/wio b/lfs/wio index 92186efad..3d788efda 100644 --- a/lfs/wio +++ b/lfs/wio @@ -15,7 +15,7 @@ THISAPP = wio-$(VER) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = wio -PAK_VER = 4 +PAK_VER = 5 ############################################################################### # Top-level Rules From patchwork Tue Sep 3 20:45:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Feddersen X-Patchwork-Id: 2391 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 46NJrr2l80z4252 for ; Tue, 3 Sep 2019 20:46:20 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 46NJrq12pPz3nD; Tue, 3 Sep 2019 20:46:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1567543579; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=4kAoGxDKwKULI2szq9pWfzAWQnE3MgLRATnpb8DYWhI=; b=Uz/UR8DFuRV39QMncU6gAJhaXr0cm53D4wxWbraMKp2kw11jwDoCTmZFGmzE3Ui+h2HeoI a7bY3XSzVkJH78FeOq5jo++S6RiWkdTDAzwmpYQRgbKSZn5bF/ln2snH4YF92Hx+H62+wK 4CZdMTdSlj/d4+OBjr5JtCZ+Qkt8v33Zyht1U26XPg6XErKWW6qVf992DjB4atgeCgR/zN pjGhL9o1CCfNpZ9N25e9rMNqtItpYlqnuNTg12B0uJrSy2xY9adiqF2znk9nA2R4Pzft6X YDp29bWYytZU5JwDoOaRYRlYZ2KEtM9ObH8MYwNUmknvihSvl491KXwvJQ+HtQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1567543579; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=4kAoGxDKwKULI2szq9pWfzAWQnE3MgLRATnpb8DYWhI=; b=xy4QsWB1E45ZtjL7kxhSqubHSNgjZHg9iDW+E/40J3CzHhqFnVW7of9wTqHYB0R6+jN4y+ OpfpQiG+45eyy4BQ== Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 46NJrn0PlKz2yjX; Tue, 3 Sep 2019 20:46:17 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 46NJrl3QlTz2ycq for ; Tue, 3 Sep 2019 20:46:15 +0000 (UTC) Received: from ubuntu.stflan.home (p5784D40F.dip0.t-ipconnect.de [87.132.212.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 46NJrl12sCz3pL; Tue, 3 Sep 2019 20:46:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1567543575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=4kAoGxDKwKULI2szq9pWfzAWQnE3MgLRATnpb8DYWhI=; b=iiyJaDOmMS14FE63cUbCefVafYpGR2SnBBVFShdHtNEKDLmTnVar5GcMuJErxCsU2UUQOC 3iFEtiQZzl/pSOOao/R8oDVoj5OS/PUxuftTDl6HmdBy3NH6vvoMlxvG1HQpVdhl/BCVOD HTbw7IyFA2Jy5+sH4lh5GlEZU7raOWC5Jf2KlqcXEV4eqwpoqr9mRTPnPkbd314n2XjyqX PaLXNrWbdtd8d/odr6U1EnMG8X1uD5QM0Ihynzo2v5tHRPOgceUh5d54fOMnDr4wFPafpe X+XiiC259gqyWgy7FUKht93/zLtOWPqdzSIDmsKm59jvomS7AutP+3pK6tNYKg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1567543575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=4kAoGxDKwKULI2szq9pWfzAWQnE3MgLRATnpb8DYWhI=; b=LhRaFUJjV9iIK95YwBnYd7+S3UsSMyrgrBk/DaH+JwdSpSf4k9kvoRuqSKPyEzc9npLrTh K63ch4hvLPwxnHAg== From: sfeddersen To: development@lists.ipfire.org Subject: [PATCH 4/5] BUG12156: GUI cosmetic to show woi logs cleaner Date: Tue, 3 Sep 2019 22:45:47 +0200 Message-Id: <20190903204548.2045-4-sfeddersen@ipfire.org> In-Reply-To: <20190903204548.2045-1-sfeddersen@ipfire.org> References: <20190903204548.2045-1-sfeddersen@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=sfeddersen smtp.mailfrom=sfeddersen@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: sfeddersen Errors-To: development-bounces@lists.ipfire.org Sender: "Development" --- html/cgi-bin/logs.cgi/log.dat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat index 136fed77c..23189eb30 100644 --- a/html/cgi-bin/logs.cgi/log.dat +++ b/html/cgi-bin/logs.cgi/log.dat @@ -50,7 +50,7 @@ $cgiparams{'SECTION'} = 'ipfire'; my %sections = ( 'auth' => '(\w+\(pam_unix\)\[.*\]: )', - 'wio' => '(wio|wio\[.*\])', + 'wio' => '(wio:|wio\[.*\])', 'captive' => '(Captive:)', 'clamav' => '(clamd\[.*\]: |freshclam\[.*\]: )', 'collectd' => '(collectd\[.*\]: )', From patchwork Tue Sep 3 20:45:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Feddersen X-Patchwork-Id: 2392 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 46NJrv4FB7z4252 for ; Tue, 3 Sep 2019 20:46:23 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 46NJrq6nSdz3pV; Tue, 3 Sep 2019 20:46:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1567543580; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=Zk4cw5tBaHUF//tVEOL2UgEoe1QdbxnFdoGtrB7+Ytw=; b=boQd+Koli0v5teAWisgfjRLEYlcB19znx4qmWCjU875cdL4bTSRRVT0Qlbi2MIsngJ8RWT apV7YWdlzl/IdQRLHypIGkHlVPsGIZWrQ8+UZemgR340f++vXzQ5KVIA8SrqY7HULmLBzD 3GSfsqKnQ4GL757DxSFY/iytQ/mTNYifOSP1K77HjWkPZJB+R9OQZx8cTWF0CYvy0mjzoW 2OK6BHdBBaVw4F8hkDJZ5Q9OyEtdavbLjwjlcm4WXVn9oBvPpFaKBS/ZByb3gyEp7qw2Uy VWqVD9ATh5V1D7ri94ZnB6ZEo+zC56IwONFzidTy58XK94NacF1ku0zxfhJnXQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1567543580; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=Zk4cw5tBaHUF//tVEOL2UgEoe1QdbxnFdoGtrB7+Ytw=; b=pN5pHVAixQYl8fmzBJjhw8PC9AH4Rujk+ow1scBT1d7ibQg9rFgbM62eR2NOcN1LfQEFrR 6VGHBDTqz/LVQ5BQ== Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 46NJrp1tcDz2yjN; Tue, 3 Sep 2019 20:46:18 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 46NJrn0NSBz2yjW for ; Tue, 3 Sep 2019 20:46:17 +0000 (UTC) Received: from ubuntu.stflan.home (p5784D40F.dip0.t-ipconnect.de [87.132.212.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 46NJrm2qtjz3pL; Tue, 3 Sep 2019 20:46:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1567543576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=Zk4cw5tBaHUF//tVEOL2UgEoe1QdbxnFdoGtrB7+Ytw=; b=UTdllWx0oIfwDyIIQ8YWk/kM3uh1p9Q6qkbM/NfcZc6bD7qcZT+VmvCT9qm9Bdpn6bt9SZ njSqwOdUoxqWjnvXwTnzaNTLI99A0ZdWU9w/9HAgDKiYHCG6NT6N0T3CKEHlClD523i7Ou D7yWkBPCeXoWBT0JG3wylBIOcoQ/dOf5puExDjBitvfFqf2AFxT7HhjmaKtBAsfH/pYiG3 rLRCEgIZoD+Hu+eO89Yg03PivGeBySNQDtE6NE2iAFFyM0Pn/MluQ3PM6DmB2kJU93L2Lb GaAR2kxD4hniPd5AwtbAd2Co/sw98mfdPa4Jvit2RxP3F+btCB+JrDHhVo1yNg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1567543576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=Zk4cw5tBaHUF//tVEOL2UgEoe1QdbxnFdoGtrB7+Ytw=; b=e9eJtlFeU1C02CqcXpal4XYyRoagk9vpW38Qo1CMiBswQPYKxsEM+egxEhYbvoOXt2yrNm dYl3sF0nEftDK6Ag== From: sfeddersen To: development@lists.ipfire.org Subject: [PATCH 5/5] BUG12156: fixed wrong permissions in install script Date: Tue, 3 Sep 2019 22:45:48 +0200 Message-Id: <20190903204548.2045-5-sfeddersen@ipfire.org> In-Reply-To: <20190903204548.2045-1-sfeddersen@ipfire.org> References: <20190903204548.2045-1-sfeddersen@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=sfeddersen smtp.mailfrom=sfeddersen@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: sfeddersen Errors-To: development-bounces@lists.ipfire.org Sender: "Development" --- src/paks/wio/install.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/src/paks/wio/install.sh b/src/paks/wio/install.sh index 5c7705bf1..220378141 100644 --- a/src/paks/wio/install.sh +++ b/src/paks/wio/install.sh @@ -26,7 +26,6 @@ extract_files restore_backup ${NAME} chown -R nobody.nobody /var/ipfire/wio -chown -R nobody.nobody /var/log/rrd/wio chown -R nobody.nobody /var/log/wio chown root.nobody /usr/local/bin/wioscan chown root.nobody /usr/local/bin/wiohelper