Message ID | 20211204234620.286-1-hofmann@leo-andres.de |
---|---|
State | Accepted |
Commit | fcc617c46692bac419743a08a24e2f45f0866542 |
Headers |
Return-Path: <development-bounces@lists.ipfire.org> 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 "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4J65v44RzSz3wtP for <patchwork@web04.haj.ipfire.org>; Sat, 4 Dec 2021 23:46:40 +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 "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4J65v33TPXz1sj; Sat, 4 Dec 2021 23:46:39 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4J65v321hrz2yWh; Sat, 4 Dec 2021 23:46:39 +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 "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4J65v240DGz2xB7 for <development@lists.ipfire.org>; Sat, 4 Dec 2021 23:46:38 +0000 (UTC) Received: from arche.uberspace.de (arche.uberspace.de [185.26.156.147]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 4J65tx0qR5z1F6 for <development@lists.ipfire.org>; Sat, 4 Dec 2021 23:46:33 +0000 (UTC) Received: (qmail 17076 invoked from network); 4 Dec 2021 23:46:32 -0000 Received: from localhost (HELO localhost) (127.0.0.1) by arche.uberspace.de with SMTP; 4 Dec 2021 23:46:32 -0000 From: hofmann@leo-andres.de To: development@lists.ipfire.org Subject: [PATCH] manualpages: Complete the list of user manual pages Date: Sun, 5 Dec 2021 00:46:20 +0100 Message-Id: <20211204234620.286-1-hofmann@leo-andres.de> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <B950B688-C83D-4972-81E9-1346BEB9BB1F@gmail.com> References: <B950B688-C83D-4972-81E9-1346BEB9BB1F@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1638661593; a=rsa-sha256; cv=none; b=ulTzgwJ2J9NIMCKq4xwqrKrx0SP1GXet4N2O9OH7QU6h9c/e73LNynCnAbcqMeBp3zpRA7 9qQe+AP6PEL7USr/USoUDqS4C+i8UnwYSwLTMrMo/HfqCfMt4fVx5IU04YXSSVC+YyIltt hbfiip2RrwUU5QaSS5hr76LjZYru7uhMXYukHyWc3RSxvuXRp7/ZpncjBfX7DLLQj6t4pO Zz/bcCvgzht69M/DTqMLKNfO8u4LxHieq+Svd2bg/mN0BE8b+mxnue+zdBPgGHWytsEJbP keGL7WXkOXyhKxBXauyvPB6OHqKOeU65Og3davBYkH4lpm9V8se1Hq60yW2Icg== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=none; spf=pass (mail01.ipfire.org: domain of hofmann@leo-andres.de designates 185.26.156.147 as permitted sender) smtp.mailfrom=hofmann@leo-andres.de; dmarc=pass (policy=none) header.from=leo-andres.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1638661593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8hp6uWXznD4TvJgEb1PbYfLIx+dHvuevJvNehX7HqYU=; b=G7c1r8VrK/fPDso2hkMqp8dLhUkWLjnqDeEZ/EV5i+Llu5Vdz3pO1PiCPogxrHIIewO5jx Q7yyxfMFtr73yBc7w4T3HYk7eZf1T2eiEazwB++X1HRDUbk3mjmbeFD5oXpfFnsRapFFyV dmqx9bymvRqyLsoBEQYaCOlY9hB4HwftrLQhD9Q/NMCfu1Y7eQsh3ePXZ/U4rpP2bDtJ1k PWDXuw2ynDTIh1tqcuQN8I2fYgdFeKJJKQ/DYhFOTKjYFbY8dzLhmt28xd7H3ih3piC7Vp bgwJ5v8cMifQnpkySgK6wWCM82LwnxLQrbISOC/jpKRWseLHtXrKb7PhSVIrTw== X-Rspamd-Queue-Id: 4J65tx0qR5z1F6 Authentication-Results: mail01.ipfire.org; dkim=none; spf=pass (mail01.ipfire.org: domain of hofmann@leo-andres.de designates 185.26.156.147 as permitted sender) smtp.mailfrom=hofmann@leo-andres.de; dmarc=pass (policy=none) header.from=leo-andres.de X-Spamd-Result: default: False [-8.81 / 11.00]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[99.99%]; IP_REPUTATION_HAM(-1.14)[asn: 205766(-0.32), country: DE(-0.01), ip: 185.26.156.147(-0.81)]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM(-0.98)[-0.981]; SPF_REPUTATION_HAM(-0.89)[-0.88651803312685]; MX_INVALID(0.50)[]; DMARC_POLICY_ALLOW(-0.50)[leo-andres.de,none]; R_MISSING_CHARSET(0.50)[]; R_SPF_ALLOW(-0.20)[+mx]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_THREE(0.00)[3]; FROM_NO_DN(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; ARC_NA(0.00)[]; ASN(0.00)[asn:205766, ipnet:185.26.156.0/24, country:DE]; FREEMAIL_CC(0.00)[gmail.com,leo-andres.de]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; TO_DN_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; R_DKIM_NA(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mail01.haj.ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk <development.lists.ipfire.org> List-Unsubscribe: <https://lists.ipfire.org/mailman/options/development>, <mailto:development-request@lists.ipfire.org?subject=unsubscribe> List-Archive: <http://lists.ipfire.org/pipermail/development/> List-Post: <mailto:development@lists.ipfire.org> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Subscribe: <https://lists.ipfire.org/mailman/listinfo/development>, <mailto:development-request@lists.ipfire.org?subject=subscribe> Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org> |
Series |
manualpages: Complete the list of user manual pages
|
|
Commit Message
Leo-Andres Hofmann
Dec. 4, 2021, 11:46 p.m. UTC
From: Jon Murphy <jcmurphy26@gmail.com> Jon Murphy gathered all the links and made the updated file available on the mailing list: https://lists.ipfire.org/pipermail/development/2021-October/011383.html https://lists.ipfire.org/pipermail/development/2021-December/011737.html With kind permission from him, this patch contains the completed list. The list was successfully checked with "./make.sh check-manualpages". Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de> Reported-by: Jon Murphy <jcmurphy26@gmail.com> --- config/cfgroot/manualpages | 81 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 78 insertions(+), 3 deletions(-)
Comments
Hi, this looks good to me. I will apply it into the temporary branch for Core Update 163, as C162 is already closed and in testing. Reviewed-by: Peter Müller <peter.mueller@ipfire.org> Thanks, and best regards, Peter Müller > From: Jon Murphy <jcmurphy26@gmail.com> > > Jon Murphy gathered all the links and made the updated file > available on the mailing list: > https://lists.ipfire.org/pipermail/development/2021-October/011383.html > https://lists.ipfire.org/pipermail/development/2021-December/011737.html > > With kind permission from him, this patch contains the completed list. > The list was successfully checked with "./make.sh check-manualpages". > > Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de> > Reported-by: Jon Murphy <jcmurphy26@gmail.com> > --- > config/cfgroot/manualpages | 81 ++++++++++++++++++++++++++++++++++++-- > 1 file changed, 78 insertions(+), 3 deletions(-) > > diff --git a/config/cfgroot/manualpages b/config/cfgroot/manualpages > index e5ab1a13c..97246e6f0 100644 > --- a/config/cfgroot/manualpages > +++ b/config/cfgroot/manualpages > @@ -1,7 +1,82 @@ > -# User manual base URL (without trailing slash) > +# Assign manual page URL path to CGI file ([cgi basename]=[path/to/page]) > + > +# Base URL (without trailing slash) > BASE_URL=https://wiki.ipfire.org > +index=configuration/system/startpage > > -# Assign manual page URL path to CGI file ([cgi basename]=[path/to/page]) > +# System menu > index=configuration/system/startpage > -pppsetup=configuration/system/dial > +mail=configuration/system/mail_service > +remote=configuration/system/ssh > +backup=configuration/system/backup > +gui=configuration/system/userinterface > +fireinfo=fireinfo > +vulnerabilities=configuration/system/vulnerabilities > +shutdown=configuration/system/shutdown > +credits=configuration/system/credits > + > +# Status menu > +system=configuration/status/system > +memory=configuration/status/memory > +services=configuration/status/services > +media=configuration/status/drives > +netexternal=configuration/status/network_ext > +netinternal=configuration/status/network_int > +netother=configuration/status/network_int > +netovpnrw=configuration/status/network_ovpnrw > +#netovpnsrv= > +hardwaregraphs=configuration/status/hardware_diagrams > +entropy=configuration/status/entropy > +connections=configuration/status/connections > +traffic=configuration/status/nettraffic > +#mdstat= > + > +# Network menu > +zoneconf=configuration/network/zoneconf > +dns=dns > +proxy=configuration/network/proxy > +urlfilter=configuration/network/proxy/url-filter > +#updatexlrator=configuration/network/proxy/update_accelerator > +dhcp=configuration/network/dhcp > +captive=configuration/network/captive > +connscheduler=configuration/network/connectionscheduler > +hosts=configuration/network/hosts > +dnsforward=configuration/network/dnsforward > +routing=configuration/network/static > +mac=configuration/network/mac-address > +wakeonlan=configuration/network/wake-on-lan > + > +# Services menu > +vpnmain=configuration/services/ipsec > +ovpnmain=configuration/services/openvpn > +ddns=configuration/services/dyndns > +time=configuration/services/ntp > qos=configuration/services/qos > +extrahd=configuration/services/extrahd > + > +# Firewall menu > +firewall=configuration/firewall > +fwhosts=configuration/firewall/fwgroups > +optionsfw=configuration/firewall/options > +ids=configuration/firewall/ips > +p2p-block=configuration/firewall/p2p-block > +location-block=configuration/firewall/geoip-block > +wireless=configuration/firewall/accesstoblue > +iptables=configuration/firewall/iptables > + > +# IPfire menu > +pakfire=configuration/ipfire/pakfire > + > +# Logs menu > +summary=configuration/logs/summary > +config=configuration/logs/logsettings > +proxylog=configuration/logs/proxy > +calamaris=configuration/logs/proxyreports > +firewalllog=configuration/logs/firewall > +firewalllogip=configuration/logs/firewall-ip > +firewalllogport=configuration/logs/firewall-port > +firewalllogcountry=configuration/logs/firewall-country > +ids=configuration/logs/ips > +#ovpnclients= > +urlfilter=configuration/logs/url-filter > +log=configuration/logs/system >
Will this mean the code change is in Core 162 and the manualpages (text file) will be in Core 163 ? > On Dec 5, 2021, at 4:37 AM, Peter Müller <peter.mueller@ipfire.org> wrote: > > Hi, > > this looks good to me. I will apply it into the temporary branch for Core Update 163, > as C162 is already closed and in testing. > > Reviewed-by: Peter Müller <peter.mueller@ipfire.org> > > Thanks, and best regards, > Peter Müller > > >> From: Jon Murphy <jcmurphy26@gmail.com> >> >> Jon Murphy gathered all the links and made the updated file >> available on the mailing list: >> https://lists.ipfire.org/pipermail/development/2021-October/011383.html >> https://lists.ipfire.org/pipermail/development/2021-December/011737.html >> >> With kind permission from him, this patch contains the completed list. >> The list was successfully checked with "./make.sh check-manualpages". >> >> Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de> >> Reported-by: Jon Murphy <jcmurphy26@gmail.com> >> --- >> config/cfgroot/manualpages | 81 ++++++++++++++++++++++++++++++++++++-- >> 1 file changed, 78 insertions(+), 3 deletions(-) >> >> diff --git a/config/cfgroot/manualpages b/config/cfgroot/manualpages >> index e5ab1a13c..97246e6f0 100644 >> --- a/config/cfgroot/manualpages >> +++ b/config/cfgroot/manualpages >> @@ -1,7 +1,82 @@ >> -# User manual base URL (without trailing slash) >> +# Assign manual page URL path to CGI file ([cgi basename]=[path/to/page]) >> + >> +# Base URL (without trailing slash) >> BASE_URL=https://wiki.ipfire.org >> +index=configuration/system/startpage >> >> -# Assign manual page URL path to CGI file ([cgi basename]=[path/to/page]) >> +# System menu >> index=configuration/system/startpage >> -pppsetup=configuration/system/dial >> +mail=configuration/system/mail_service >> +remote=configuration/system/ssh >> +backup=configuration/system/backup >> +gui=configuration/system/userinterface >> +fireinfo=fireinfo >> +vulnerabilities=configuration/system/vulnerabilities >> +shutdown=configuration/system/shutdown >> +credits=configuration/system/credits >> + >> +# Status menu >> +system=configuration/status/system >> +memory=configuration/status/memory >> +services=configuration/status/services >> +media=configuration/status/drives >> +netexternal=configuration/status/network_ext >> +netinternal=configuration/status/network_int >> +netother=configuration/status/network_int >> +netovpnrw=configuration/status/network_ovpnrw >> +#netovpnsrv= >> +hardwaregraphs=configuration/status/hardware_diagrams >> +entropy=configuration/status/entropy >> +connections=configuration/status/connections >> +traffic=configuration/status/nettraffic >> +#mdstat= >> + >> +# Network menu >> +zoneconf=configuration/network/zoneconf >> +dns=dns >> +proxy=configuration/network/proxy >> +urlfilter=configuration/network/proxy/url-filter >> +#updatexlrator=configuration/network/proxy/update_accelerator >> +dhcp=configuration/network/dhcp >> +captive=configuration/network/captive >> +connscheduler=configuration/network/connectionscheduler >> +hosts=configuration/network/hosts >> +dnsforward=configuration/network/dnsforward >> +routing=configuration/network/static >> +mac=configuration/network/mac-address >> +wakeonlan=configuration/network/wake-on-lan >> + >> +# Services menu >> +vpnmain=configuration/services/ipsec >> +ovpnmain=configuration/services/openvpn >> +ddns=configuration/services/dyndns >> +time=configuration/services/ntp >> qos=configuration/services/qos >> +extrahd=configuration/services/extrahd >> + >> +# Firewall menu >> +firewall=configuration/firewall >> +fwhosts=configuration/firewall/fwgroups >> +optionsfw=configuration/firewall/options >> +ids=configuration/firewall/ips >> +p2p-block=configuration/firewall/p2p-block >> +location-block=configuration/firewall/geoip-block >> +wireless=configuration/firewall/accesstoblue >> +iptables=configuration/firewall/iptables >> + >> +# IPfire menu >> +pakfire=configuration/ipfire/pakfire >> + >> +# Logs menu >> +summary=configuration/logs/summary >> +config=configuration/logs/logsettings >> +proxylog=configuration/logs/proxy >> +calamaris=configuration/logs/proxyreports >> +firewalllog=configuration/logs/firewall >> +firewalllogip=configuration/logs/firewall-ip >> +firewalllogport=configuration/logs/firewall-port >> +firewalllogcountry=configuration/logs/firewall-country >> +ids=configuration/logs/ips >> +#ovpnclients= >> +urlfilter=configuration/logs/url-filter >> +log=configuration/logs/system >>
Hello, I am quite confused, too. I thought all of this was already in the update. We seem to at least be missing this patch which isn’t a problem. Is there anything else that needs to go into 162 to make this fully work? -Michael > On 5 Dec 2021, at 17:13, Jon Murphy <jcmurphy26@gmail.com> wrote: > > Will this mean the code change is in Core 162 and the manualpages (text file) will be in Core 163 ? > >> On Dec 5, 2021, at 4:37 AM, Peter Müller <peter.mueller@ipfire.org> wrote: >> >> Hi, >> >> this looks good to me. I will apply it into the temporary branch for Core Update 163, >> as C162 is already closed and in testing. >> >> Reviewed-by: Peter Müller <peter.mueller@ipfire.org> >> >> Thanks, and best regards, >> Peter Müller >> >> >>> From: Jon Murphy <jcmurphy26@gmail.com> >>> >>> Jon Murphy gathered all the links and made the updated file >>> available on the mailing list: >>> https://lists.ipfire.org/pipermail/development/2021-October/011383.html >>> https://lists.ipfire.org/pipermail/development/2021-December/011737.html >>> >>> With kind permission from him, this patch contains the completed list. >>> The list was successfully checked with "./make.sh check-manualpages". >>> >>> Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de> >>> Reported-by: Jon Murphy <jcmurphy26@gmail.com> >>> --- >>> config/cfgroot/manualpages | 81 ++++++++++++++++++++++++++++++++++++-- >>> 1 file changed, 78 insertions(+), 3 deletions(-) >>> >>> diff --git a/config/cfgroot/manualpages b/config/cfgroot/manualpages >>> index e5ab1a13c..97246e6f0 100644 >>> --- a/config/cfgroot/manualpages >>> +++ b/config/cfgroot/manualpages >>> @@ -1,7 +1,82 @@ >>> -# User manual base URL (without trailing slash) >>> +# Assign manual page URL path to CGI file ([cgi basename]=[path/to/page]) >>> + >>> +# Base URL (without trailing slash) >>> BASE_URL=https://wiki.ipfire.org >>> +index=configuration/system/startpage >>> >>> -# Assign manual page URL path to CGI file ([cgi basename]=[path/to/page]) >>> +# System menu >>> index=configuration/system/startpage >>> -pppsetup=configuration/system/dial >>> +mail=configuration/system/mail_service >>> +remote=configuration/system/ssh >>> +backup=configuration/system/backup >>> +gui=configuration/system/userinterface >>> +fireinfo=fireinfo >>> +vulnerabilities=configuration/system/vulnerabilities >>> +shutdown=configuration/system/shutdown >>> +credits=configuration/system/credits >>> + >>> +# Status menu >>> +system=configuration/status/system >>> +memory=configuration/status/memory >>> +services=configuration/status/services >>> +media=configuration/status/drives >>> +netexternal=configuration/status/network_ext >>> +netinternal=configuration/status/network_int >>> +netother=configuration/status/network_int >>> +netovpnrw=configuration/status/network_ovpnrw >>> +#netovpnsrv= >>> +hardwaregraphs=configuration/status/hardware_diagrams >>> +entropy=configuration/status/entropy >>> +connections=configuration/status/connections >>> +traffic=configuration/status/nettraffic >>> +#mdstat= >>> + >>> +# Network menu >>> +zoneconf=configuration/network/zoneconf >>> +dns=dns >>> +proxy=configuration/network/proxy >>> +urlfilter=configuration/network/proxy/url-filter >>> +#updatexlrator=configuration/network/proxy/update_accelerator >>> +dhcp=configuration/network/dhcp >>> +captive=configuration/network/captive >>> +connscheduler=configuration/network/connectionscheduler >>> +hosts=configuration/network/hosts >>> +dnsforward=configuration/network/dnsforward >>> +routing=configuration/network/static >>> +mac=configuration/network/mac-address >>> +wakeonlan=configuration/network/wake-on-lan >>> + >>> +# Services menu >>> +vpnmain=configuration/services/ipsec >>> +ovpnmain=configuration/services/openvpn >>> +ddns=configuration/services/dyndns >>> +time=configuration/services/ntp >>> qos=configuration/services/qos >>> +extrahd=configuration/services/extrahd >>> + >>> +# Firewall menu >>> +firewall=configuration/firewall >>> +fwhosts=configuration/firewall/fwgroups >>> +optionsfw=configuration/firewall/options >>> +ids=configuration/firewall/ips >>> +p2p-block=configuration/firewall/p2p-block >>> +location-block=configuration/firewall/geoip-block >>> +wireless=configuration/firewall/accesstoblue >>> +iptables=configuration/firewall/iptables >>> + >>> +# IPfire menu >>> +pakfire=configuration/ipfire/pakfire >>> + >>> +# Logs menu >>> +summary=configuration/logs/summary >>> +config=configuration/logs/logsettings >>> +proxylog=configuration/logs/proxy >>> +calamaris=configuration/logs/proxyreports >>> +firewalllog=configuration/logs/firewall >>> +firewalllogip=configuration/logs/firewall-ip >>> +firewalllogport=configuration/logs/firewall-port >>> +firewalllogcountry=configuration/logs/firewall-country >>> +ids=configuration/logs/ips >>> +#ovpnclients= >>> +urlfilter=configuration/logs/url-filter >>> +log=configuration/logs/system >>> >
Hi, On 08/12/2021 11:35, Michael Tremer wrote: > Hello, > > I am quite confused, too. > > I thought all of this was already in the update. We seem to at least be missing this patch which isn’t a problem. My understanding is that the original patch provided the code to be able to show the help symbols if there was a link provided but the only link was for the main page. This additional patch now provides the list of links for each of the menu pages in the WUI that have a page in the wiki. Regards, Adolf. > Is there anything else that needs to go into 162 to make this fully work? > > -Michael > >> On 5 Dec 2021, at 17:13, Jon Murphy <jcmurphy26@gmail.com> wrote: >> >> Will this mean the code change is in Core 162 and the manualpages (text file) will be in Core 163 ? >> >>> On Dec 5, 2021, at 4:37 AM, Peter Müller <peter.mueller@ipfire.org> wrote: >>> >>> Hi, >>> >>> this looks good to me. I will apply it into the temporary branch for Core Update 163, >>> as C162 is already closed and in testing. >>> >>> Reviewed-by: Peter Müller <peter.mueller@ipfire.org> >>> >>> Thanks, and best regards, >>> Peter Müller >>> >>> >>>> From: Jon Murphy <jcmurphy26@gmail.com> >>>> >>>> Jon Murphy gathered all the links and made the updated file >>>> available on the mailing list: >>>> https://lists.ipfire.org/pipermail/development/2021-October/011383.html >>>> https://lists.ipfire.org/pipermail/development/2021-December/011737.html >>>> >>>> With kind permission from him, this patch contains the completed list. >>>> The list was successfully checked with "./make.sh check-manualpages". >>>> >>>> Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de> >>>> Reported-by: Jon Murphy <jcmurphy26@gmail.com> >>>> --- >>>> config/cfgroot/manualpages | 81 ++++++++++++++++++++++++++++++++++++-- >>>> 1 file changed, 78 insertions(+), 3 deletions(-) >>>> >>>> diff --git a/config/cfgroot/manualpages b/config/cfgroot/manualpages >>>> index e5ab1a13c..97246e6f0 100644 >>>> --- a/config/cfgroot/manualpages >>>> +++ b/config/cfgroot/manualpages >>>> @@ -1,7 +1,82 @@ >>>> -# User manual base URL (without trailing slash) >>>> +# Assign manual page URL path to CGI file ([cgi basename]=[path/to/page]) >>>> + >>>> +# Base URL (without trailing slash) >>>> BASE_URL=https://wiki.ipfire.org >>>> +index=configuration/system/startpage >>>> >>>> -# Assign manual page URL path to CGI file ([cgi basename]=[path/to/page]) >>>> +# System menu >>>> index=configuration/system/startpage >>>> -pppsetup=configuration/system/dial >>>> +mail=configuration/system/mail_service >>>> +remote=configuration/system/ssh >>>> +backup=configuration/system/backup >>>> +gui=configuration/system/userinterface >>>> +fireinfo=fireinfo >>>> +vulnerabilities=configuration/system/vulnerabilities >>>> +shutdown=configuration/system/shutdown >>>> +credits=configuration/system/credits >>>> + >>>> +# Status menu >>>> +system=configuration/status/system >>>> +memory=configuration/status/memory >>>> +services=configuration/status/services >>>> +media=configuration/status/drives >>>> +netexternal=configuration/status/network_ext >>>> +netinternal=configuration/status/network_int >>>> +netother=configuration/status/network_int >>>> +netovpnrw=configuration/status/network_ovpnrw >>>> +#netovpnsrv= >>>> +hardwaregraphs=configuration/status/hardware_diagrams >>>> +entropy=configuration/status/entropy >>>> +connections=configuration/status/connections >>>> +traffic=configuration/status/nettraffic >>>> +#mdstat= >>>> + >>>> +# Network menu >>>> +zoneconf=configuration/network/zoneconf >>>> +dns=dns >>>> +proxy=configuration/network/proxy >>>> +urlfilter=configuration/network/proxy/url-filter >>>> +#updatexlrator=configuration/network/proxy/update_accelerator >>>> +dhcp=configuration/network/dhcp >>>> +captive=configuration/network/captive >>>> +connscheduler=configuration/network/connectionscheduler >>>> +hosts=configuration/network/hosts >>>> +dnsforward=configuration/network/dnsforward >>>> +routing=configuration/network/static >>>> +mac=configuration/network/mac-address >>>> +wakeonlan=configuration/network/wake-on-lan >>>> + >>>> +# Services menu >>>> +vpnmain=configuration/services/ipsec >>>> +ovpnmain=configuration/services/openvpn >>>> +ddns=configuration/services/dyndns >>>> +time=configuration/services/ntp >>>> qos=configuration/services/qos >>>> +extrahd=configuration/services/extrahd >>>> + >>>> +# Firewall menu >>>> +firewall=configuration/firewall >>>> +fwhosts=configuration/firewall/fwgroups >>>> +optionsfw=configuration/firewall/options >>>> +ids=configuration/firewall/ips >>>> +p2p-block=configuration/firewall/p2p-block >>>> +location-block=configuration/firewall/geoip-block >>>> +wireless=configuration/firewall/accesstoblue >>>> +iptables=configuration/firewall/iptables >>>> + >>>> +# IPfire menu >>>> +pakfire=configuration/ipfire/pakfire >>>> + >>>> +# Logs menu >>>> +summary=configuration/logs/summary >>>> +config=configuration/logs/logsettings >>>> +proxylog=configuration/logs/proxy >>>> +calamaris=configuration/logs/proxyreports >>>> +firewalllog=configuration/logs/firewall >>>> +firewalllogip=configuration/logs/firewall-ip >>>> +firewalllogport=configuration/logs/firewall-port >>>> +firewalllogcountry=configuration/logs/firewall-country >>>> +ids=configuration/logs/ips >>>> +#ovpnclients= >>>> +urlfilter=configuration/logs/url-filter >>>> +log=configuration/logs/system >>>>
Hi all, Please excuse the confusion, I'll try to explain. Most important first: This does not fail in Core 162! The code is complete and does not generate errors or incorrect links. (I just checked that again and I also always make sure my patches don't break stuff before submitting.) When I presented the idea on the mailing list in September, I included three sample links in my patch and asked for help in collecting more. https://patchwork.ipfire.org/project/ipfire/patch/20210919143444.1739-1-hofmann@leo-andres.de/ https://patchwork.ipfire.org/project/ipfire/patch/20210928110906.1089-1-hofmann@leo-andres.de/ The incomplete file had to be there for the code to work and anyone to add more links to it. But strictly speaking, the feature wasn't yet complete. I should have made it clearer that the revised patchset did not come with a complete list either and still required more work. This was obvious to me, but I did not communicate it well. I wasn't paying attention and I do apologize for that. If we leave it as it is now, core 162 will enable only three links and core 163 will then bring the complete feature. The links point to the correct wiki page and appear on the following pages: Index, PPP setup, QoS Regards Leo Am 08.12.2021 um 12:29 schrieb Adolf Belka: > Hi, > > On 08/12/2021 11:35, Michael Tremer wrote: >> Hello, >> >> I am quite confused, too. >> >> I thought all of this was already in the update. We seem to at least be missing this patch which isn’t a problem. > > My understanding is that the original patch provided the code to be able to show the help symbols if there was a link provided but the only link was for the main page. This additional patch now provides the list of links for each of the menu pages in the WUI that have a page in the wiki. > > Regards, > > Adolf. > >> Is there anything else that needs to go into 162 to make this fully work? >> >> -Michael >> >>> On 5 Dec 2021, at 17:13, Jon Murphy <jcmurphy26@gmail.com> wrote: >>> >>> Will this mean the code change is in Core 162 and the manualpages (text file) will be in Core 163 ? >>> >>>> On Dec 5, 2021, at 4:37 AM, Peter Müller <peter.mueller@ipfire.org> wrote: >>>> >>>> Hi, >>>> >>>> this looks good to me. I will apply it into the temporary branch for Core Update 163, >>>> as C162 is already closed and in testing. >>>> >>>> Reviewed-by: Peter Müller <peter.mueller@ipfire.org> >>>> >>>> Thanks, and best regards, >>>> Peter Müller >>>> >>>> >>>>> From: Jon Murphy <jcmurphy26@gmail.com> >>>>> >>>>> Jon Murphy gathered all the links and made the updated file >>>>> available on the mailing list: >>>>> https://lists.ipfire.org/pipermail/development/2021-October/011383.html >>>>> https://lists.ipfire.org/pipermail/development/2021-December/011737.html >>>>> >>>>> With kind permission from him, this patch contains the completed list. >>>>> The list was successfully checked with "./make.sh check-manualpages". >>>>> >>>>> Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de> >>>>> Reported-by: Jon Murphy <jcmurphy26@gmail.com> >>>>> --- >>>>> config/cfgroot/manualpages | 81 ++++++++++++++++++++++++++++++++++++-- >>>>> 1 file changed, 78 insertions(+), 3 deletions(-) >>>>> >>>>> diff --git a/config/cfgroot/manualpages b/config/cfgroot/manualpages >>>>> index e5ab1a13c..97246e6f0 100644 >>>>> --- a/config/cfgroot/manualpages >>>>> +++ b/config/cfgroot/manualpages >>>>> @@ -1,7 +1,82 @@ >>>>> -# User manual base URL (without trailing slash) >>>>> +# Assign manual page URL path to CGI file ([cgi basename]=[path/to/page]) >>>>> + >>>>> +# Base URL (without trailing slash) >>>>> BASE_URL=https://wiki.ipfire.org >>>>> +index=configuration/system/startpage >>>>> >>>>> -# Assign manual page URL path to CGI file ([cgi basename]=[path/to/page]) >>>>> +# System menu >>>>> index=configuration/system/startpage >>>>> -pppsetup=configuration/system/dial >>>>> +mail=configuration/system/mail_service >>>>> +remote=configuration/system/ssh >>>>> +backup=configuration/system/backup >>>>> +gui=configuration/system/userinterface >>>>> +fireinfo=fireinfo >>>>> +vulnerabilities=configuration/system/vulnerabilities >>>>> +shutdown=configuration/system/shutdown >>>>> +credits=configuration/system/credits >>>>> + >>>>> +# Status menu >>>>> +system=configuration/status/system >>>>> +memory=configuration/status/memory >>>>> +services=configuration/status/services >>>>> +media=configuration/status/drives >>>>> +netexternal=configuration/status/network_ext >>>>> +netinternal=configuration/status/network_int >>>>> +netother=configuration/status/network_int >>>>> +netovpnrw=configuration/status/network_ovpnrw >>>>> +#netovpnsrv= >>>>> +hardwaregraphs=configuration/status/hardware_diagrams >>>>> +entropy=configuration/status/entropy >>>>> +connections=configuration/status/connections >>>>> +traffic=configuration/status/nettraffic >>>>> +#mdstat= >>>>> + >>>>> +# Network menu >>>>> +zoneconf=configuration/network/zoneconf >>>>> +dns=dns >>>>> +proxy=configuration/network/proxy >>>>> +urlfilter=configuration/network/proxy/url-filter >>>>> +#updatexlrator=configuration/network/proxy/update_accelerator >>>>> +dhcp=configuration/network/dhcp >>>>> +captive=configuration/network/captive >>>>> +connscheduler=configuration/network/connectionscheduler >>>>> +hosts=configuration/network/hosts >>>>> +dnsforward=configuration/network/dnsforward >>>>> +routing=configuration/network/static >>>>> +mac=configuration/network/mac-address >>>>> +wakeonlan=configuration/network/wake-on-lan >>>>> + >>>>> +# Services menu >>>>> +vpnmain=configuration/services/ipsec >>>>> +ovpnmain=configuration/services/openvpn >>>>> +ddns=configuration/services/dyndns >>>>> +time=configuration/services/ntp >>>>> qos=configuration/services/qos >>>>> +extrahd=configuration/services/extrahd >>>>> + >>>>> +# Firewall menu >>>>> +firewall=configuration/firewall >>>>> +fwhosts=configuration/firewall/fwgroups >>>>> +optionsfw=configuration/firewall/options >>>>> +ids=configuration/firewall/ips >>>>> +p2p-block=configuration/firewall/p2p-block >>>>> +location-block=configuration/firewall/geoip-block >>>>> +wireless=configuration/firewall/accesstoblue >>>>> +iptables=configuration/firewall/iptables >>>>> + >>>>> +# IPfire menu >>>>> +pakfire=configuration/ipfire/pakfire >>>>> + >>>>> +# Logs menu >>>>> +summary=configuration/logs/summary >>>>> +config=configuration/logs/logsettings >>>>> +proxylog=configuration/logs/proxy >>>>> +calamaris=configuration/logs/proxyreports >>>>> +firewalllog=configuration/logs/firewall >>>>> +firewalllogip=configuration/logs/firewall-ip >>>>> +firewalllogport=configuration/logs/firewall-port >>>>> +firewalllogcountry=configuration/logs/firewall-country >>>>> +ids=configuration/logs/ips >>>>> +#ovpnclients= >>>>> +urlfilter=configuration/logs/url-filter >>>>> +log=configuration/logs/system >>>>>
My apologies for causing all of the confusion and all of the mailing list noise. Jon > On Dec 8, 2021, at 6:43 AM, Leo Hofmann <hofmann@leo-andres.de> wrote: > > Hi all, > > Please excuse the confusion, I'll try to explain. > > Most important first: This does not fail in Core 162! > The code is complete and does not generate errors or incorrect links. > (I just checked that again and I also always make sure my patches don't break stuff before submitting.) > > When I presented the idea on the mailing list in September, I included three sample links in my patch and asked for help in collecting more. > > https://patchwork.ipfire.org/project/ipfire/patch/20210919143444.1739-1-hofmann@leo-andres.de/ > https://patchwork.ipfire.org/project/ipfire/patch/20210928110906.1089-1-hofmann@leo-andres.de/ > > The incomplete file had to be there for the code to work and anyone to add more links to it. But strictly speaking, the feature wasn't yet complete. > > I should have made it clearer that the revised patchset did not come with a complete list either and still required more work. > This was obvious to me, but I did not communicate it well. I wasn't paying attention and I do apologize for that. > > If we leave it as it is now, core 162 will enable only three links and core 163 will then bring the complete feature. > The links point to the correct wiki page and appear on the following pages: Index, PPP setup, QoS > > Regards > Leo > > Am 08.12.2021 um 12:29 schrieb Adolf Belka: >> Hi, >> >> On 08/12/2021 11:35, Michael Tremer wrote: >>> Hello, >>> >>> I am quite confused, too. >>> >>> I thought all of this was already in the update. We seem to at least be missing this patch which isn’t a problem. >> >> My understanding is that the original patch provided the code to be able to show the help symbols if there was a link provided but the only link was for the main page. This additional patch now provides the list of links for each of the menu pages in the WUI that have a page in the wiki. >> >> Regards, >> >> Adolf. >> >>> Is there anything else that needs to go into 162 to make this fully work? >>> >>> -Michael >>> >>>> On 5 Dec 2021, at 17:13, Jon Murphy <jcmurphy26@gmail.com> wrote: >>>> >>>> Will this mean the code change is in Core 162 and the manualpages (text file) will be in Core 163 ? >>>> >>>>> On Dec 5, 2021, at 4:37 AM, Peter Müller <peter.mueller@ipfire.org> wrote: >>>>> >>>>> Hi, >>>>> >>>>> this looks good to me. I will apply it into the temporary branch for Core Update 163, >>>>> as C162 is already closed and in testing. >>>>> >>>>> Reviewed-by: Peter Müller <peter.mueller@ipfire.org> >>>>> >>>>> Thanks, and best regards, >>>>> Peter Müller >>>>> >>>>> >>>>>> From: Jon Murphy <jcmurphy26@gmail.com> >>>>>> >>>>>> Jon Murphy gathered all the links and made the updated file >>>>>> available on the mailing list: >>>>>> https://lists.ipfire.org/pipermail/development/2021-October/011383.html >>>>>> https://lists.ipfire.org/pipermail/development/2021-December/011737.html >>>>>> >>>>>> With kind permission from him, this patch contains the completed list. >>>>>> The list was successfully checked with "./make.sh check-manualpages". >>>>>> >>>>>> Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de> >>>>>> Reported-by: Jon Murphy <jcmurphy26@gmail.com> >>>>>> --- >>>>>> config/cfgroot/manualpages | 81 ++++++++++++++++++++++++++++++++++++-- >>>>>> 1 file changed, 78 insertions(+), 3 deletions(-) >>>>>> >>>>>> diff --git a/config/cfgroot/manualpages b/config/cfgroot/manualpages >>>>>> index e5ab1a13c..97246e6f0 100644 >>>>>> --- a/config/cfgroot/manualpages >>>>>> +++ b/config/cfgroot/manualpages >>>>>> @@ -1,7 +1,82 @@ >>>>>> -# User manual base URL (without trailing slash) >>>>>> +# Assign manual page URL path to CGI file ([cgi basename]=[path/to/page]) >>>>>> + >>>>>> +# Base URL (without trailing slash) >>>>>> BASE_URL=https://wiki.ipfire.org >>>>>> +index=configuration/system/startpage >>>>>> >>>>>> -# Assign manual page URL path to CGI file ([cgi basename]=[path/to/page]) >>>>>> +# System menu >>>>>> index=configuration/system/startpage >>>>>> -pppsetup=configuration/system/dial >>>>>> +mail=configuration/system/mail_service >>>>>> +remote=configuration/system/ssh >>>>>> +backup=configuration/system/backup >>>>>> +gui=configuration/system/userinterface >>>>>> +fireinfo=fireinfo >>>>>> +vulnerabilities=configuration/system/vulnerabilities >>>>>> +shutdown=configuration/system/shutdown >>>>>> +credits=configuration/system/credits >>>>>> + >>>>>> +# Status menu >>>>>> +system=configuration/status/system >>>>>> +memory=configuration/status/memory >>>>>> +services=configuration/status/services >>>>>> +media=configuration/status/drives >>>>>> +netexternal=configuration/status/network_ext >>>>>> +netinternal=configuration/status/network_int >>>>>> +netother=configuration/status/network_int >>>>>> +netovpnrw=configuration/status/network_ovpnrw >>>>>> +#netovpnsrv= >>>>>> +hardwaregraphs=configuration/status/hardware_diagrams >>>>>> +entropy=configuration/status/entropy >>>>>> +connections=configuration/status/connections >>>>>> +traffic=configuration/status/nettraffic >>>>>> +#mdstat= >>>>>> + >>>>>> +# Network menu >>>>>> +zoneconf=configuration/network/zoneconf >>>>>> +dns=dns >>>>>> +proxy=configuration/network/proxy >>>>>> +urlfilter=configuration/network/proxy/url-filter >>>>>> +#updatexlrator=configuration/network/proxy/update_accelerator >>>>>> +dhcp=configuration/network/dhcp >>>>>> +captive=configuration/network/captive >>>>>> +connscheduler=configuration/network/connectionscheduler >>>>>> +hosts=configuration/network/hosts >>>>>> +dnsforward=configuration/network/dnsforward >>>>>> +routing=configuration/network/static >>>>>> +mac=configuration/network/mac-address >>>>>> +wakeonlan=configuration/network/wake-on-lan >>>>>> + >>>>>> +# Services menu >>>>>> +vpnmain=configuration/services/ipsec >>>>>> +ovpnmain=configuration/services/openvpn >>>>>> +ddns=configuration/services/dyndns >>>>>> +time=configuration/services/ntp >>>>>> qos=configuration/services/qos >>>>>> +extrahd=configuration/services/extrahd >>>>>> + >>>>>> +# Firewall menu >>>>>> +firewall=configuration/firewall >>>>>> +fwhosts=configuration/firewall/fwgroups >>>>>> +optionsfw=configuration/firewall/options >>>>>> +ids=configuration/firewall/ips >>>>>> +p2p-block=configuration/firewall/p2p-block >>>>>> +location-block=configuration/firewall/geoip-block >>>>>> +wireless=configuration/firewall/accesstoblue >>>>>> +iptables=configuration/firewall/iptables >>>>>> + >>>>>> +# IPfire menu >>>>>> +pakfire=configuration/ipfire/pakfire >>>>>> + >>>>>> +# Logs menu >>>>>> +summary=configuration/logs/summary >>>>>> +config=configuration/logs/logsettings >>>>>> +proxylog=configuration/logs/proxy >>>>>> +calamaris=configuration/logs/proxyreports >>>>>> +firewalllog=configuration/logs/firewall >>>>>> +firewalllogip=configuration/logs/firewall-ip >>>>>> +firewalllogport=configuration/logs/firewall-port >>>>>> +firewalllogcountry=configuration/logs/firewall-country >>>>>> +ids=configuration/logs/ips >>>>>> +#ovpnclients= >>>>>> +urlfilter=configuration/logs/url-filter >>>>>> +log=configuration/logs/system >>>>>>
Hello, > On 8 Dec 2021, at 12:43, Leo Hofmann <hofmann@leo-andres.de> wrote: > > Hi all, > > Please excuse the confusion, I'll try to explain. > > Most important first: This does not fail in Core 162! > The code is complete and does not generate errors or incorrect links. > (I just checked that again and I also always make sure my patches don't break stuff before submitting.) That is a very good approach :) > When I presented the idea on the mailing list in September, I included three sample links in my patch and asked for help in collecting more. > > https://patchwork.ipfire.org/project/ipfire/patch/20210919143444.1739-1-hofmann@leo-andres.de/ > https://patchwork.ipfire.org/project/ipfire/patch/20210928110906.1089-1-hofmann@leo-andres.de/ > > The incomplete file had to be there for the code to work and anyone to add more links to it. But strictly speaking, the feature wasn't yet complete. Oh, I didn’t realise this. I clicked on a link and it worked :) > I should have made it clearer that the revised patchset did not come with a complete list either and still required more work. > This was obvious to me, but I did not communicate it well. I wasn't paying attention and I do apologize for that. No need to apologise. > If we leave it as it is now, core 162 will enable only three links and core 163 will then bring the complete feature. > The links point to the correct wiki page and appear on the following pages: Index, PPP setup, QoS Adding the latest patch with the extra links is no trouble. We have to build the entire update again due to some breaks in suricata. I just wanted to make sure that we catch it all. Best, -Michael > > Regards > Leo > > Am 08.12.2021 um 12:29 schrieb Adolf Belka: >> Hi, >> >> On 08/12/2021 11:35, Michael Tremer wrote: >>> Hello, >>> >>> I am quite confused, too. >>> >>> I thought all of this was already in the update. We seem to at least be missing this patch which isn’t a problem. >> >> My understanding is that the original patch provided the code to be able to show the help symbols if there was a link provided but the only link was for the main page. This additional patch now provides the list of links for each of the menu pages in the WUI that have a page in the wiki. >> >> Regards, >> >> Adolf. >> >>> Is there anything else that needs to go into 162 to make this fully work? >>> >>> -Michael >>> >>>> On 5 Dec 2021, at 17:13, Jon Murphy <jcmurphy26@gmail.com> wrote: >>>> >>>> Will this mean the code change is in Core 162 and the manualpages (text file) will be in Core 163 ? >>>> >>>>> On Dec 5, 2021, at 4:37 AM, Peter Müller <peter.mueller@ipfire.org> wrote: >>>>> >>>>> Hi, >>>>> >>>>> this looks good to me. I will apply it into the temporary branch for Core Update 163, >>>>> as C162 is already closed and in testing. >>>>> >>>>> Reviewed-by: Peter Müller <peter.mueller@ipfire.org> >>>>> >>>>> Thanks, and best regards, >>>>> Peter Müller >>>>> >>>>> >>>>>> From: Jon Murphy <jcmurphy26@gmail.com> >>>>>> >>>>>> Jon Murphy gathered all the links and made the updated file >>>>>> available on the mailing list: >>>>>> https://lists.ipfire.org/pipermail/development/2021-October/011383.html >>>>>> https://lists.ipfire.org/pipermail/development/2021-December/011737.html >>>>>> >>>>>> With kind permission from him, this patch contains the completed list. >>>>>> The list was successfully checked with "./make.sh check-manualpages". >>>>>> >>>>>> Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de> >>>>>> Reported-by: Jon Murphy <jcmurphy26@gmail.com> >>>>>> --- >>>>>> config/cfgroot/manualpages | 81 ++++++++++++++++++++++++++++++++++++-- >>>>>> 1 file changed, 78 insertions(+), 3 deletions(-) >>>>>> >>>>>> diff --git a/config/cfgroot/manualpages b/config/cfgroot/manualpages >>>>>> index e5ab1a13c..97246e6f0 100644 >>>>>> --- a/config/cfgroot/manualpages >>>>>> +++ b/config/cfgroot/manualpages >>>>>> @@ -1,7 +1,82 @@ >>>>>> -# User manual base URL (without trailing slash) >>>>>> +# Assign manual page URL path to CGI file ([cgi basename]=[path/to/page]) >>>>>> + >>>>>> +# Base URL (without trailing slash) >>>>>> BASE_URL=https://wiki.ipfire.org >>>>>> +index=configuration/system/startpage >>>>>> >>>>>> -# Assign manual page URL path to CGI file ([cgi basename]=[path/to/page]) >>>>>> +# System menu >>>>>> index=configuration/system/startpage >>>>>> -pppsetup=configuration/system/dial >>>>>> +mail=configuration/system/mail_service >>>>>> +remote=configuration/system/ssh >>>>>> +backup=configuration/system/backup >>>>>> +gui=configuration/system/userinterface >>>>>> +fireinfo=fireinfo >>>>>> +vulnerabilities=configuration/system/vulnerabilities >>>>>> +shutdown=configuration/system/shutdown >>>>>> +credits=configuration/system/credits >>>>>> + >>>>>> +# Status menu >>>>>> +system=configuration/status/system >>>>>> +memory=configuration/status/memory >>>>>> +services=configuration/status/services >>>>>> +media=configuration/status/drives >>>>>> +netexternal=configuration/status/network_ext >>>>>> +netinternal=configuration/status/network_int >>>>>> +netother=configuration/status/network_int >>>>>> +netovpnrw=configuration/status/network_ovpnrw >>>>>> +#netovpnsrv= >>>>>> +hardwaregraphs=configuration/status/hardware_diagrams >>>>>> +entropy=configuration/status/entropy >>>>>> +connections=configuration/status/connections >>>>>> +traffic=configuration/status/nettraffic >>>>>> +#mdstat= >>>>>> + >>>>>> +# Network menu >>>>>> +zoneconf=configuration/network/zoneconf >>>>>> +dns=dns >>>>>> +proxy=configuration/network/proxy >>>>>> +urlfilter=configuration/network/proxy/url-filter >>>>>> +#updatexlrator=configuration/network/proxy/update_accelerator >>>>>> +dhcp=configuration/network/dhcp >>>>>> +captive=configuration/network/captive >>>>>> +connscheduler=configuration/network/connectionscheduler >>>>>> +hosts=configuration/network/hosts >>>>>> +dnsforward=configuration/network/dnsforward >>>>>> +routing=configuration/network/static >>>>>> +mac=configuration/network/mac-address >>>>>> +wakeonlan=configuration/network/wake-on-lan >>>>>> + >>>>>> +# Services menu >>>>>> +vpnmain=configuration/services/ipsec >>>>>> +ovpnmain=configuration/services/openvpn >>>>>> +ddns=configuration/services/dyndns >>>>>> +time=configuration/services/ntp >>>>>> qos=configuration/services/qos >>>>>> +extrahd=configuration/services/extrahd >>>>>> + >>>>>> +# Firewall menu >>>>>> +firewall=configuration/firewall >>>>>> +fwhosts=configuration/firewall/fwgroups >>>>>> +optionsfw=configuration/firewall/options >>>>>> +ids=configuration/firewall/ips >>>>>> +p2p-block=configuration/firewall/p2p-block >>>>>> +location-block=configuration/firewall/geoip-block >>>>>> +wireless=configuration/firewall/accesstoblue >>>>>> +iptables=configuration/firewall/iptables >>>>>> + >>>>>> +# IPfire menu >>>>>> +pakfire=configuration/ipfire/pakfire >>>>>> + >>>>>> +# Logs menu >>>>>> +summary=configuration/logs/summary >>>>>> +config=configuration/logs/logsettings >>>>>> +proxylog=configuration/logs/proxy >>>>>> +calamaris=configuration/logs/proxyreports >>>>>> +firewalllog=configuration/logs/firewall >>>>>> +firewalllogip=configuration/logs/firewall-ip >>>>>> +firewalllogport=configuration/logs/firewall-port >>>>>> +firewalllogcountry=configuration/logs/firewall-country >>>>>> +ids=configuration/logs/ips >>>>>> +#ovpnclients= >>>>>> +urlfilter=configuration/logs/url-filter >>>>>> +log=configuration/logs/system >>>>>>
Hello, No need to freak out. We caught this all in the testing phase and that is exactly what it is there for. We just don’t want to break shit in production :) -Michael > On 8 Dec 2021, at 17:35, Jon Murphy <jcmurphy26@gmail.com> wrote: > > My apologies for causing all of the confusion and all of the mailing list noise. > > Jon > >> On Dec 8, 2021, at 6:43 AM, Leo Hofmann <hofmann@leo-andres.de> wrote: >> >> Hi all, >> >> Please excuse the confusion, I'll try to explain. >> >> Most important first: This does not fail in Core 162! >> The code is complete and does not generate errors or incorrect links. >> (I just checked that again and I also always make sure my patches don't break stuff before submitting.) >> >> When I presented the idea on the mailing list in September, I included three sample links in my patch and asked for help in collecting more. >> >> https://patchwork.ipfire.org/project/ipfire/patch/20210919143444.1739-1-hofmann@leo-andres.de/ >> https://patchwork.ipfire.org/project/ipfire/patch/20210928110906.1089-1-hofmann@leo-andres.de/ >> >> The incomplete file had to be there for the code to work and anyone to add more links to it. But strictly speaking, the feature wasn't yet complete. >> >> I should have made it clearer that the revised patchset did not come with a complete list either and still required more work. >> This was obvious to me, but I did not communicate it well. I wasn't paying attention and I do apologize for that. >> >> If we leave it as it is now, core 162 will enable only three links and core 163 will then bring the complete feature. >> The links point to the correct wiki page and appear on the following pages: Index, PPP setup, QoS >> >> Regards >> Leo >> >> Am 08.12.2021 um 12:29 schrieb Adolf Belka: >>> Hi, >>> >>> On 08/12/2021 11:35, Michael Tremer wrote: >>>> Hello, >>>> >>>> I am quite confused, too. >>>> >>>> I thought all of this was already in the update. We seem to at least be missing this patch which isn’t a problem. >>> >>> My understanding is that the original patch provided the code to be able to show the help symbols if there was a link provided but the only link was for the main page. This additional patch now provides the list of links for each of the menu pages in the WUI that have a page in the wiki. >>> >>> Regards, >>> >>> Adolf. >>> >>>> Is there anything else that needs to go into 162 to make this fully work? >>>> >>>> -Michael >>>> >>>>> On 5 Dec 2021, at 17:13, Jon Murphy <jcmurphy26@gmail.com> wrote: >>>>> >>>>> Will this mean the code change is in Core 162 and the manualpages (text file) will be in Core 163 ? >>>>> >>>>>> On Dec 5, 2021, at 4:37 AM, Peter Müller <peter.mueller@ipfire.org> wrote: >>>>>> >>>>>> Hi, >>>>>> >>>>>> this looks good to me. I will apply it into the temporary branch for Core Update 163, >>>>>> as C162 is already closed and in testing. >>>>>> >>>>>> Reviewed-by: Peter Müller <peter.mueller@ipfire.org> >>>>>> >>>>>> Thanks, and best regards, >>>>>> Peter Müller >>>>>> >>>>>> >>>>>>> From: Jon Murphy <jcmurphy26@gmail.com> >>>>>>> >>>>>>> Jon Murphy gathered all the links and made the updated file >>>>>>> available on the mailing list: >>>>>>> https://lists.ipfire.org/pipermail/development/2021-October/011383.html >>>>>>> https://lists.ipfire.org/pipermail/development/2021-December/011737.html >>>>>>> >>>>>>> With kind permission from him, this patch contains the completed list. >>>>>>> The list was successfully checked with "./make.sh check-manualpages". >>>>>>> >>>>>>> Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de> >>>>>>> Reported-by: Jon Murphy <jcmurphy26@gmail.com> >>>>>>> --- >>>>>>> config/cfgroot/manualpages | 81 ++++++++++++++++++++++++++++++++++++-- >>>>>>> 1 file changed, 78 insertions(+), 3 deletions(-) >>>>>>> >>>>>>> diff --git a/config/cfgroot/manualpages b/config/cfgroot/manualpages >>>>>>> index e5ab1a13c..97246e6f0 100644 >>>>>>> --- a/config/cfgroot/manualpages >>>>>>> +++ b/config/cfgroot/manualpages >>>>>>> @@ -1,7 +1,82 @@ >>>>>>> -# User manual base URL (without trailing slash) >>>>>>> +# Assign manual page URL path to CGI file ([cgi basename]=[path/to/page]) >>>>>>> + >>>>>>> +# Base URL (without trailing slash) >>>>>>> BASE_URL=https://wiki.ipfire.org >>>>>>> +index=configuration/system/startpage >>>>>>> >>>>>>> -# Assign manual page URL path to CGI file ([cgi basename]=[path/to/page]) >>>>>>> +# System menu >>>>>>> index=configuration/system/startpage >>>>>>> -pppsetup=configuration/system/dial >>>>>>> +mail=configuration/system/mail_service >>>>>>> +remote=configuration/system/ssh >>>>>>> +backup=configuration/system/backup >>>>>>> +gui=configuration/system/userinterface >>>>>>> +fireinfo=fireinfo >>>>>>> +vulnerabilities=configuration/system/vulnerabilities >>>>>>> +shutdown=configuration/system/shutdown >>>>>>> +credits=configuration/system/credits >>>>>>> + >>>>>>> +# Status menu >>>>>>> +system=configuration/status/system >>>>>>> +memory=configuration/status/memory >>>>>>> +services=configuration/status/services >>>>>>> +media=configuration/status/drives >>>>>>> +netexternal=configuration/status/network_ext >>>>>>> +netinternal=configuration/status/network_int >>>>>>> +netother=configuration/status/network_int >>>>>>> +netovpnrw=configuration/status/network_ovpnrw >>>>>>> +#netovpnsrv= >>>>>>> +hardwaregraphs=configuration/status/hardware_diagrams >>>>>>> +entropy=configuration/status/entropy >>>>>>> +connections=configuration/status/connections >>>>>>> +traffic=configuration/status/nettraffic >>>>>>> +#mdstat= >>>>>>> + >>>>>>> +# Network menu >>>>>>> +zoneconf=configuration/network/zoneconf >>>>>>> +dns=dns >>>>>>> +proxy=configuration/network/proxy >>>>>>> +urlfilter=configuration/network/proxy/url-filter >>>>>>> +#updatexlrator=configuration/network/proxy/update_accelerator >>>>>>> +dhcp=configuration/network/dhcp >>>>>>> +captive=configuration/network/captive >>>>>>> +connscheduler=configuration/network/connectionscheduler >>>>>>> +hosts=configuration/network/hosts >>>>>>> +dnsforward=configuration/network/dnsforward >>>>>>> +routing=configuration/network/static >>>>>>> +mac=configuration/network/mac-address >>>>>>> +wakeonlan=configuration/network/wake-on-lan >>>>>>> + >>>>>>> +# Services menu >>>>>>> +vpnmain=configuration/services/ipsec >>>>>>> +ovpnmain=configuration/services/openvpn >>>>>>> +ddns=configuration/services/dyndns >>>>>>> +time=configuration/services/ntp >>>>>>> qos=configuration/services/qos >>>>>>> +extrahd=configuration/services/extrahd >>>>>>> + >>>>>>> +# Firewall menu >>>>>>> +firewall=configuration/firewall >>>>>>> +fwhosts=configuration/firewall/fwgroups >>>>>>> +optionsfw=configuration/firewall/options >>>>>>> +ids=configuration/firewall/ips >>>>>>> +p2p-block=configuration/firewall/p2p-block >>>>>>> +location-block=configuration/firewall/geoip-block >>>>>>> +wireless=configuration/firewall/accesstoblue >>>>>>> +iptables=configuration/firewall/iptables >>>>>>> + >>>>>>> +# IPfire menu >>>>>>> +pakfire=configuration/ipfire/pakfire >>>>>>> + >>>>>>> +# Logs menu >>>>>>> +summary=configuration/logs/summary >>>>>>> +config=configuration/logs/logsettings >>>>>>> +proxylog=configuration/logs/proxy >>>>>>> +calamaris=configuration/logs/proxyreports >>>>>>> +firewalllog=configuration/logs/firewall >>>>>>> +firewalllogip=configuration/logs/firewall-ip >>>>>>> +firewalllogport=configuration/logs/firewall-port >>>>>>> +firewalllogcountry=configuration/logs/firewall-country >>>>>>> +ids=configuration/logs/ips >>>>>>> +#ovpnclients= >>>>>>> +urlfilter=configuration/logs/url-filter >>>>>>> +log=configuration/logs/system >>>>>>> >
diff --git a/config/cfgroot/manualpages b/config/cfgroot/manualpages index e5ab1a13c..97246e6f0 100644 --- a/config/cfgroot/manualpages +++ b/config/cfgroot/manualpages @@ -1,7 +1,82 @@ -# User manual base URL (without trailing slash) +# Assign manual page URL path to CGI file ([cgi basename]=[path/to/page]) + +# Base URL (without trailing slash) BASE_URL=https://wiki.ipfire.org +index=configuration/system/startpage -# Assign manual page URL path to CGI file ([cgi basename]=[path/to/page]) +# System menu index=configuration/system/startpage -pppsetup=configuration/system/dial +mail=configuration/system/mail_service +remote=configuration/system/ssh +backup=configuration/system/backup +gui=configuration/system/userinterface +fireinfo=fireinfo +vulnerabilities=configuration/system/vulnerabilities +shutdown=configuration/system/shutdown +credits=configuration/system/credits + +# Status menu +system=configuration/status/system +memory=configuration/status/memory +services=configuration/status/services +media=configuration/status/drives +netexternal=configuration/status/network_ext +netinternal=configuration/status/network_int +netother=configuration/status/network_int +netovpnrw=configuration/status/network_ovpnrw +#netovpnsrv= +hardwaregraphs=configuration/status/hardware_diagrams +entropy=configuration/status/entropy +connections=configuration/status/connections +traffic=configuration/status/nettraffic +#mdstat= + +# Network menu +zoneconf=configuration/network/zoneconf +dns=dns +proxy=configuration/network/proxy +urlfilter=configuration/network/proxy/url-filter +#updatexlrator=configuration/network/proxy/update_accelerator +dhcp=configuration/network/dhcp +captive=configuration/network/captive +connscheduler=configuration/network/connectionscheduler +hosts=configuration/network/hosts +dnsforward=configuration/network/dnsforward +routing=configuration/network/static +mac=configuration/network/mac-address +wakeonlan=configuration/network/wake-on-lan + +# Services menu +vpnmain=configuration/services/ipsec +ovpnmain=configuration/services/openvpn +ddns=configuration/services/dyndns +time=configuration/services/ntp qos=configuration/services/qos +extrahd=configuration/services/extrahd + +# Firewall menu +firewall=configuration/firewall +fwhosts=configuration/firewall/fwgroups +optionsfw=configuration/firewall/options +ids=configuration/firewall/ips +p2p-block=configuration/firewall/p2p-block +location-block=configuration/firewall/geoip-block +wireless=configuration/firewall/accesstoblue +iptables=configuration/firewall/iptables + +# IPfire menu +pakfire=configuration/ipfire/pakfire + +# Logs menu +summary=configuration/logs/summary +config=configuration/logs/logsettings +proxylog=configuration/logs/proxy +calamaris=configuration/logs/proxyreports +firewalllog=configuration/logs/firewall +firewalllogip=configuration/logs/firewall-ip +firewalllogport=configuration/logs/firewall-port +firewalllogcountry=configuration/logs/firewall-country +ids=configuration/logs/ips +#ovpnclients= +urlfilter=configuration/logs/url-filter +log=configuration/logs/system