forked from cockpit/cockpit
Add various patches for slfo-1.1
- suse_docs.patch: update documentation to point at new links (bsc#1226050) - remove_rh_links.patch: remove additional hardcoded RH refs (bsc#1221336) - hide-pcp.patch: correct patch to properly disable pcp on micro (bsc#1226049) - suse-microos-branding.patch: use suse ID as branding instead of sle-micro (bsc#1227441)
This commit is contained in:
parent
f835006e9a
commit
ceefa1a840
@ -1,3 +1,13 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Oct 9 12:14:14 UTC 2024 - Alice Brooks <alice.brooks@suse.com>
|
||||||
|
|
||||||
|
- suse_docs.patch: update documentation to point at new links (bsc#1226050)
|
||||||
|
- remove_rh_links.patch: remove additional hardcoded RH refs (bsc#1221336)
|
||||||
|
- hide-pcp.patch: correct patch to properly disable pcp on micro
|
||||||
|
(bsc#1226049)
|
||||||
|
- suse-microos-branding.patch: use suse ID as branding instead of sle-micro
|
||||||
|
(bsc#1227441)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Aug 20 11:44:33 UTC 2024 - Alice Brooks <alice.brooks@suse.com>
|
Mon Aug 20 11:44:33 UTC 2024 - Alice Brooks <alice.brooks@suse.com>
|
||||||
|
|
||||||
|
10
cockpit.spec
10
cockpit.spec
@ -74,6 +74,8 @@ Patch104: selinux_libdir.patch
|
|||||||
Patch105: fix-libexecdir.patch
|
Patch105: fix-libexecdir.patch
|
||||||
Patch106: 0005-cockpit-ws-user-remove-default-deps.patch
|
Patch106: 0005-cockpit-ws-user-remove-default-deps.patch
|
||||||
|
|
||||||
|
Patch201: remove_rh_links.patch
|
||||||
|
|
||||||
%define build_all 1
|
%define build_all 1
|
||||||
%if 0%{?rhel} == 8 && 0%{?epel} == 0 && !0%{?build_all}
|
%if 0%{?rhel} == 8 && 0%{?epel} == 0 && !0%{?build_all}
|
||||||
|
|
||||||
@ -245,6 +247,8 @@ BuildRequires: python3-tox-current-env
|
|||||||
%patch -P 105 -p1
|
%patch -P 105 -p1
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%patch -P 201 -p1
|
||||||
|
|
||||||
cp %SOURCE1 tools/cockpit.pam
|
cp %SOURCE1 tools/cockpit.pam
|
||||||
#
|
#
|
||||||
local-npm-registry %{_sourcedir} install --include=dev --ignore-scripts
|
local-npm-registry %{_sourcedir} install --include=dev --ignore-scripts
|
||||||
@ -428,13 +432,13 @@ sed -i "s|%{buildroot}||" *.list
|
|||||||
# remove brandings with stale symlinks. Means they don't match
|
# remove brandings with stale symlinks. Means they don't match
|
||||||
# the distro.
|
# the distro.
|
||||||
pushd %{buildroot}/%{_datadir}/cockpit/branding
|
pushd %{buildroot}/%{_datadir}/cockpit/branding
|
||||||
ls --hide={default,kubernetes,opensuse,registry,sle-micro,suse} | xargs rm -rv
|
ls --hide={default,kubernetes,opensuse,registry,suse} | xargs rm -rv
|
||||||
popd
|
popd
|
||||||
# need this in SUSE as post build checks dislike stale symlinks
|
# need this in SUSE as post build checks dislike stale symlinks
|
||||||
install -m 644 -D /dev/null %{buildroot}/run/cockpit/motd
|
install -m 644 -D /dev/null %{buildroot}/run/cockpit/motd
|
||||||
test -e %{buildroot}/usr/share/cockpit/branding/opensuse/default-1920x1200.jpg || install -m 644 -D /dev/null %{buildroot}/usr/share/cockpit/branding/opensuse/default-1920x1200.jpg
|
test -e %{buildroot}/usr/share/cockpit/branding/opensuse/default-1920x1200.jpg || install -m 644 -D /dev/null %{buildroot}/usr/share/cockpit/branding/opensuse/default-1920x1200.jpg
|
||||||
test -e %{buildroot}/usr/share/cockpit/branding/sle-micro/apple-touch-icon.png || install -m 644 -D /dev/null %{buildroot}/usr/share/cockpit/branding/sle-micro/apple-touch-icon.png
|
test -e %{buildroot}/usr/share/cockpit/branding/suse/apple-touch-icon.png || install -m 644 -D /dev/null %{buildroot}/usr/share/cockpit/branding/suse/apple-touch-icon.png
|
||||||
test -e %{buildroot}/usr/share/cockpit/branding/sle-micro/default-1920x1200.png || install -m 644 -D /dev/null %{buildroot}/usr/share/cockpit/branding/sle-micro/default-1920x1200.png
|
test -e %{buildroot}/usr/share/cockpit/branding/suse/default-1920x1200.png || install -m 644 -D /dev/null %{buildroot}/usr/share/cockpit/branding/suse/default-1920x1200.png
|
||||||
# remove files of not installable packages
|
# remove files of not installable packages
|
||||||
rm -r %{buildroot}%{_datadir}/cockpit/sosreport
|
rm -r %{buildroot}%{_datadir}/cockpit/sosreport
|
||||||
rm -f %{buildroot}/%{_prefix}/share/metainfo/org.cockpit-project.cockpit-sosreport.metainfo.xml
|
rm -f %{buildroot}/%{_prefix}/share/metainfo/org.cockpit-project.cockpit-sosreport.metainfo.xml
|
||||||
|
@ -2,11 +2,33 @@ Index: cockpit/pkg/metrics/metrics.jsx
|
|||||||
===================================================================
|
===================================================================
|
||||||
--- cockpit.orig/pkg/metrics/metrics.jsx
|
--- cockpit.orig/pkg/metrics/metrics.jsx
|
||||||
+++ cockpit/pkg/metrics/metrics.jsx
|
+++ cockpit/pkg/metrics/metrics.jsx
|
||||||
@@ -1551,6 +1551,7 @@ const PCPConfig = ({ buttonVariant, fire
|
@@ -1565,6 +1565,7 @@ const PCPConfig = ({ buttonVariant, firewalldRequest, needsLogout, setNeedsLogou
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Button variant={buttonVariant} icon={<CogIcon />}
|
<Button variant={buttonVariant} icon={<CogIcon />}
|
||||||
+ className="pf-u-display-none"
|
+ className="pf-u-display-none"
|
||||||
isDisabled={ invalidService(s_pmlogger) || invalidService(s_pmproxy) || invalidService(s_redis) || invalidService(s_redis_server) }
|
isDisabled={ invalidService(s_pmlogger) || invalidService(s_pmproxy) ||
|
||||||
|
invalidService(s_redis) || invalidService(s_redis_server) || invalidService(s_valkey) }
|
||||||
onClick={show_dialog}>
|
onClick={show_dialog}>
|
||||||
{ _("Metrics settings") }
|
Index: cockpit-309/pkg/metrics/metrics.jsx
|
||||||
|
===================================================================
|
||||||
|
--- cockpit-309.orig/pkg/metrics/metrics.jsx
|
||||||
|
+++ cockpit-309/pkg/metrics/metrics.jsx
|
||||||
|
@@ -1824,7 +1825,8 @@ class MetricsHistory extends React.Component {
|
||||||
|
// on a single machine, cockpit-pcp depends on pcp; but this may not be the case in the beiboot scenario,
|
||||||
|
// so additionally check if pcp is available on the logged in target machine
|
||||||
|
if ((cockpit.manifests && !cockpit.manifests.pcp) || this.pmlogger_service.exists === false)
|
||||||
|
- return <EmptyStatePanel
|
||||||
|
+ return <EmptyStatePanel />
|
||||||
|
+/* return <EmptyStatePanel
|
||||||
|
icon={ExclamationCircleIcon}
|
||||||
|
title={_("Package cockpit-pcp is missing for metrics history")}
|
||||||
|
action={this.state.isBeibootBridge === true
|
||||||
|
@@ -1834,6 +1834,7 @@ class MetricsHistory extends React.Component {
|
||||||
|
? <Text>{ _("Installation not supported without installed cockpit package") }</Text>
|
||||||
|
: this.state.packagekitExists && <Button onClick={this.handleInstall}>{_("Install cockpit-pcp")}</Button>}
|
||||||
|
/>;
|
||||||
|
+*/
|
||||||
|
|
||||||
|
if (!this.state.metricsAvailable) {
|
||||||
|
let action;
|
||||||
|
108
remove_rh_links.patch
Normal file
108
remove_rh_links.patch
Normal file
@ -0,0 +1,108 @@
|
|||||||
|
Index: cockpit-309/pkg/systemd/overview-cards/cryptoPolicies.jsx
|
||||||
|
===================================================================
|
||||||
|
--- cockpit-309.orig/pkg/systemd/overview-cards/cryptoPolicies.jsx
|
||||||
|
+++ cockpit-309/pkg/systemd/overview-cards/cryptoPolicies.jsx
|
||||||
|
@@ -115,7 +115,7 @@ const CryptoPolicyDialog = ({
|
||||||
|
variant='link'
|
||||||
|
isInline
|
||||||
|
icon={<ExternalLinkSquareAltIcon />} iconPosition="right"
|
||||||
|
- href="https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/security_hardening/assembly_installing-the-system-in-fips-mode_security-hardening">
|
||||||
|
+ href="https://documentation.suse.com/sle-micro/6.0/html/Micro-selinux/selinux-article.html">
|
||||||
|
{_("Learn more")}
|
||||||
|
</Button>
|
||||||
|
</Flex>),
|
||||||
|
@@ -154,16 +154,6 @@ const CryptoPolicyDialog = ({
|
||||||
|
{_("Cryptographic Policies is a system component that configures the core cryptographic subsystems, covering the TLS, IPSec, SSH, DNSSec, and Kerberos protocols.")}
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
- footerContent={
|
||||||
|
- <Button component='a'
|
||||||
|
- rel="noopener noreferrer" target="_blank"
|
||||||
|
- variant='link'
|
||||||
|
- isInline
|
||||||
|
- icon={<ExternalLinkSquareAltIcon />} iconPosition="right"
|
||||||
|
- href="https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/security_hardening/using-the-system-wide-cryptographic-policies_security-hardening">
|
||||||
|
- {_("Learn more")}
|
||||||
|
- </Button>
|
||||||
|
- }
|
||||||
|
>
|
||||||
|
<Button variant="plain" aria-label={_("Help")}>
|
||||||
|
<HelpIcon />
|
||||||
|
Index: cockpit-309/pkg/systemd/overview-cards/tuned-dialog.jsx
|
||||||
|
===================================================================
|
||||||
|
--- cockpit-309.orig/pkg/systemd/overview-cards/tuned-dialog.jsx
|
||||||
|
+++ cockpit-309/pkg/systemd/overview-cards/tuned-dialog.jsx
|
||||||
|
@@ -273,36 +273,10 @@ const TunedDialog = ({
|
||||||
|
.finally(() => setLoading(false));
|
||||||
|
}, [updateButton, poll, tunedService, tunedDbus]);
|
||||||
|
|
||||||
|
- const help = (
|
||||||
|
- <Popover
|
||||||
|
- id="tuned-help"
|
||||||
|
- bodyContent={
|
||||||
|
- <div>
|
||||||
|
- {_("Tuned is a service that monitors your system and optimizes the performance under certain workloads. The core of Tuned are profiles, which tune your system for different use cases.")}
|
||||||
|
- </div>
|
||||||
|
- }
|
||||||
|
- footerContent={
|
||||||
|
- <Button component='a'
|
||||||
|
- rel="noopener noreferrer" target="_blank"
|
||||||
|
- variant='link'
|
||||||
|
- isInline
|
||||||
|
- icon={<ExternalLinkSquareAltIcon />} iconPosition="right"
|
||||||
|
- href="https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html-single/managing_systems_using_the_rhel_9_web_console/index#performance-tuning-options-in-the-web-console_optimizing-the-system-performance-using-the-web-console">
|
||||||
|
- {_("Learn more")}
|
||||||
|
- </Button>
|
||||||
|
- }
|
||||||
|
- >
|
||||||
|
- <Button variant="plain" aria-label={_("Help")}>
|
||||||
|
- <HelpIcon />
|
||||||
|
- </Button>
|
||||||
|
- </Popover>
|
||||||
|
- );
|
||||||
|
-
|
||||||
|
return (
|
||||||
|
<Modal position="top" variant="medium"
|
||||||
|
className="ct-m-stretch-body"
|
||||||
|
isOpen
|
||||||
|
- help={help}
|
||||||
|
onClose={Dialogs.close}
|
||||||
|
title={_("Change performance profile")}
|
||||||
|
footer={
|
||||||
|
Index: cockpit-309/pkg/systemd/hwinfo.jsx
|
||||||
|
===================================================================
|
||||||
|
--- cockpit-309.orig/pkg/systemd/hwinfo.jsx
|
||||||
|
+++ cockpit-309/pkg/systemd/hwinfo.jsx
|
||||||
|
@@ -201,11 +201,6 @@ const CPUSecurityMitigationsDialog = () => {
|
||||||
|
<DataListCell key="primary content">
|
||||||
|
<span>
|
||||||
|
<div className='nosmt-heading'>{ _("Disable simultaneous multithreading") } (nosmt)</div>
|
||||||
|
- <small className='nosmt-read-more-link'>
|
||||||
|
- <a href="https://access.redhat.com/security/vulnerabilities/L1TF" target="_blank" rel="noopener noreferrer">
|
||||||
|
- <ExternalLinkAltIcon /> { _("Read more...") }
|
||||||
|
- </a>
|
||||||
|
- </small>
|
||||||
|
</span>
|
||||||
|
</DataListCell>,
|
||||||
|
]}
|
||||||
|
Index: cockpit-309/pkg/networkmanager/bond.jsx
|
||||||
|
===================================================================
|
||||||
|
--- cockpit-309.orig/pkg/networkmanager/bond.jsx
|
||||||
|
+++ cockpit-309/pkg/networkmanager/bond.jsx
|
||||||
|
@@ -142,16 +142,6 @@ export const BondDialog = ({ connection, dev, settings }) => {
|
||||||
|
{_("A network bond combines multiple network interfaces into one logical interface with higher throughput or redundancy.")}
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
- footerContent={
|
||||||
|
- <Button component='a'
|
||||||
|
- rel="noopener noreferrer" target="_blank"
|
||||||
|
- variant='link'
|
||||||
|
- isInline
|
||||||
|
- icon={<ExternalLinkSquareAltIcon />} iconPosition="right"
|
||||||
|
- href="https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/configuring-network-bonds-using-the-web-console_system-management-using-the-rhel-9-web-console">
|
||||||
|
- {_("Learn more")}
|
||||||
|
- </Button>
|
||||||
|
- }
|
||||||
|
>
|
||||||
|
<Button id="bond-help-popup-button" variant="plain" aria-label="Help">
|
||||||
|
<HelpIcon />
|
@ -8,11 +8,11 @@ to be available during build and installed on the target system to work
|
|||||||
properly.
|
properly.
|
||||||
---
|
---
|
||||||
Makefile.am | 1 +
|
Makefile.am | 1 +
|
||||||
src/branding/sle-micro/Makefile.am | 11 ++++
|
src/branding/suse/Makefile.am | 11 ++++
|
||||||
src/branding/sle-micro/branding.css | 87 ++++++++++++++++++++++++++
|
src/branding/suse/branding.css | 87 ++++++++++++++++++++++++++
|
||||||
3 files changed, 99 insertions(+)
|
3 files changed, 99 insertions(+)
|
||||||
create mode 100644 src/branding/sle-micro/Makefile.am
|
create mode 100644 src/branding/suse/Makefile.am
|
||||||
create mode 100644 src/branding/sle-micro/branding.css
|
create mode 100644 src/branding/suse/branding.css
|
||||||
|
|
||||||
Index: cockpit-309/Makefile.am
|
Index: cockpit-309/Makefile.am
|
||||||
===================================================================
|
===================================================================
|
||||||
@ -22,19 +22,19 @@ Index: cockpit-309/Makefile.am
|
|||||||
include src/branding/fedora/Makefile.am
|
include src/branding/fedora/Makefile.am
|
||||||
include src/branding/kubernetes/Makefile.am
|
include src/branding/kubernetes/Makefile.am
|
||||||
include src/branding/opensuse/Makefile.am
|
include src/branding/opensuse/Makefile.am
|
||||||
+include src/branding/sle-micro/Makefile.am
|
+include src/branding/suse/Makefile.am
|
||||||
include src/branding/registry/Makefile.am
|
include src/branding/registry/Makefile.am
|
||||||
include src/branding/rhel/Makefile.am
|
include src/branding/rhel/Makefile.am
|
||||||
include src/branding/scientific/Makefile.am
|
include src/branding/scientific/Makefile.am
|
||||||
Index: cockpit-309/src/branding/sle-micro/Makefile.am
|
Index: cockpit-309/src/branding/suse/Makefile.am
|
||||||
===================================================================
|
===================================================================
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ cockpit-309/src/branding/sle-micro/Makefile.am
|
+++ cockpit-309/src/branding/suse/Makefile.am
|
||||||
@@ -0,0 +1,11 @@
|
@@ -0,0 +1,11 @@
|
||||||
+slemicrobrandingdir = $(datadir)/cockpit/branding/sle-micro
|
+slemicrobrandingdir = $(datadir)/cockpit/branding/suse
|
||||||
+
|
+
|
||||||
+dist_slemicrobranding_DATA = \
|
+dist_slemicrobranding_DATA = \
|
||||||
+ src/branding/sle-micro/branding.css \
|
+ src/branding/suse/branding.css \
|
||||||
+ $(NULL)
|
+ $(NULL)
|
||||||
+
|
+
|
||||||
+install-data-hook::
|
+install-data-hook::
|
||||||
@ -42,10 +42,10 @@ Index: cockpit-309/src/branding/sle-micro/Makefile.am
|
|||||||
+ ln -sf /usr/share/pixmaps/distribution-logos/square-hicolor.svg $(DESTDIR)$(slemicrobrandingdir)/square-hicolor.svg
|
+ ln -sf /usr/share/pixmaps/distribution-logos/square-hicolor.svg $(DESTDIR)$(slemicrobrandingdir)/square-hicolor.svg
|
||||||
+ ln -sf /usr/share/pixmaps/distribution-logos/favicon.ico $(DESTDIR)$(slemicrobrandingdir)/favicon.ico
|
+ ln -sf /usr/share/pixmaps/distribution-logos/favicon.ico $(DESTDIR)$(slemicrobrandingdir)/favicon.ico
|
||||||
+ ln -sf /usr/share/pixmaps/distribution-logos/apple-touch-icon.png $(DESTDIR)$(slemicrobrandingdir)/apple-touch-icon.png
|
+ ln -sf /usr/share/pixmaps/distribution-logos/apple-touch-icon.png $(DESTDIR)$(slemicrobrandingdir)/apple-touch-icon.png
|
||||||
Index: cockpit-309/src/branding/sle-micro/branding.css
|
Index: cockpit-309/src/branding/suse/branding.css
|
||||||
===================================================================
|
===================================================================
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ cockpit-309/src/branding/sle-micro/branding.css
|
+++ cockpit-309/src/branding/suse/branding.css
|
||||||
@@ -0,0 +1,87 @@
|
@@ -0,0 +1,87 @@
|
||||||
+/* Extra overrides */
|
+/* Extra overrides */
|
||||||
+:root {
|
+:root {
|
||||||
|
235
suse_docs.patch
235
suse_docs.patch
@ -1,21 +1,21 @@
|
|||||||
From a051a54e7a522e1a6f20a56d3cae5f3eacdeeff9 Mon Sep 17 00:00:00 2001
|
From adadbac839dc6d549a3a9b75ae1f8c422e82fa7c Mon Sep 17 00:00:00 2001
|
||||||
From: Luna <luna.dragon@suse.com>
|
From: Luna <luna.dragon@suse.com>
|
||||||
Date: Fri, 16 Aug 2024 11:10:19 +0530
|
Date: Thu, 25 Jan 2024 10:06:03 +0530
|
||||||
Subject: [PATCH] replace with suse docs and move docs with out eqiv to docs-rh
|
Subject: [PATCH] replace with suse docs and move docs with out eqiv to docs-rh
|
||||||
|
|
||||||
---
|
---
|
||||||
pkg/kdump/manifest.json | 2 +-
|
node_modules | 2 +-
|
||||||
pkg/networkmanager/manifest.json | 12 ++++--------
|
pkg/networkmanager/manifest.json | 19 +++++++++++--------
|
||||||
pkg/shell/manifest.json | 2 +-
|
pkg/shell/manifest.json | 4 ++--
|
||||||
pkg/storaged/manifest.json | 12 +++++++-----
|
pkg/storaged/manifest.json | 12 +++++++-----
|
||||||
pkg/systemd/manifest.json | 6 +++---
|
pkg/systemd/manifest.json | 6 +++---
|
||||||
pkg/users/manifest.json | 4 ++--
|
pkg/users/manifest.json | 2 +-
|
||||||
6 files changed, 18 insertions(+), 20 deletions(-)
|
6 files changed, 25 insertions(+), 20 deletions(-)
|
||||||
|
|
||||||
diff --git a/pkg/kdump/manifest.json b/pkg/kdump/manifest.json
|
Index: cockpit/pkg/kdump/manifest.json
|
||||||
index 65a03d10f..ac0ee34b9 100644
|
===================================================================
|
||||||
--- a/pkg/kdump/manifest.json
|
--- cockpit.orig/pkg/kdump/manifest.json
|
||||||
+++ b/pkg/kdump/manifest.json
|
+++ cockpit/pkg/kdump/manifest.json
|
||||||
@@ -5,7 +5,7 @@
|
@@ -5,7 +5,7 @@
|
||||||
"tools": {
|
"tools": {
|
||||||
"index": {
|
"index": {
|
||||||
@ -25,11 +25,11 @@ index 65a03d10f..ac0ee34b9 100644
|
|||||||
{
|
{
|
||||||
"label": "Configuring kdump",
|
"label": "Configuring kdump",
|
||||||
"url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/configuring-kdump-in-the-web-console_system-management-using-the-rhel-9-web-console"
|
"url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/configuring-kdump-in-the-web-console_system-management-using-the-rhel-9-web-console"
|
||||||
diff --git a/pkg/networkmanager/manifest.json b/pkg/networkmanager/manifest.json
|
Index: cockpit/pkg/networkmanager/manifest.json
|
||||||
index c7b2cc6a0..f37aa1565 100644
|
===================================================================
|
||||||
--- a/pkg/networkmanager/manifest.json
|
--- cockpit.orig/pkg/networkmanager/manifest.json
|
||||||
+++ b/pkg/networkmanager/manifest.json
|
+++ cockpit/pkg/networkmanager/manifest.json
|
||||||
@@ -10,23 +10,19 @@
|
@@ -10,23 +10,25 @@
|
||||||
"docs": [
|
"docs": [
|
||||||
{
|
{
|
||||||
"label": "Managing networking bonds",
|
"label": "Managing networking bonds",
|
||||||
@ -38,29 +38,124 @@ index c7b2cc6a0..f37aa1565 100644
|
|||||||
- {
|
- {
|
||||||
- "label": "Managing networking teams",
|
- "label": "Managing networking teams",
|
||||||
- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/configuring-network-teams-using-the-web-console_system-management-using-the-rhel-9-web-console"
|
- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/configuring-network-teams-using-the-web-console_system-management-using-the-rhel-9-web-console"
|
||||||
+ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#cockpit-managing-bonds"
|
+ "url": "https://documentation.suse.com/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#cockpit-managing-bonds"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"label": "Managing networking bridges",
|
"label": "Managing networking bridges",
|
||||||
- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/configuring-network-bridges-in-the-web-console_system-management-using-the-rhel-9-web-console"
|
- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/configuring-network-bridges-in-the-web-console_system-management-using-the-rhel-9-web-console"
|
||||||
+ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#task-managing-bridges"
|
+ "url": "https://documentation.suse.com/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#task-managing-bridges"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"label": "Managing VLANs",
|
"label": "Managing VLANs",
|
||||||
- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/configuring-vlans-in-the-web-console_system-management-using-the-rhel-9-web-console"
|
- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/configuring-vlans-in-the-web-console_system-management-using-the-rhel-9-web-console"
|
||||||
+ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#task-managing-vlans"
|
+ "url": "https://documentation.suse.com/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#task-managing-vlans"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"label": "Managing firewall",
|
"label": "Managing firewall",
|
||||||
- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/managing_firewall_using_the_web_console"
|
- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/managing_firewall_using_the_web_console"
|
||||||
+ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#task-managing-firewall-cockpit"
|
+ "url": "https://documentation.suse.com/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#task-managing-firewall-cockpit"
|
||||||
|
+ }
|
||||||
|
+ ],
|
||||||
|
+ "docs-rh": [
|
||||||
|
+ {
|
||||||
|
+ "label": "Managing networking teams",
|
||||||
|
+ "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/configuring-network-teams-using-the-web-console_system-management-using-the-rhel-8-web-console"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"keywords": [
|
"keywords": [
|
||||||
diff --git a/pkg/shell/manifest.json b/pkg/shell/manifest.json
|
Index: cockpit/pkg/packagekit/manifest.json
|
||||||
index a252e76d9..83be922c7 100644
|
===================================================================
|
||||||
--- a/pkg/shell/manifest.json
|
--- cockpit.orig/pkg/packagekit/manifest.json
|
||||||
+++ b/pkg/shell/manifest.json
|
+++ cockpit/pkg/packagekit/manifest.json
|
||||||
|
@@ -9,7 +9,7 @@
|
||||||
|
"tools": {
|
||||||
|
"index": {
|
||||||
|
"label": "Software updates",
|
||||||
|
- "docs": [
|
||||||
|
+ "docs-rh": [
|
||||||
|
{
|
||||||
|
"label": "Managing software updates",
|
||||||
|
"url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/managing-software-updates-in-the-web-console_system-management-using-the-rhel-9-web-console"
|
||||||
|
Index: cockpit/pkg/storaged/manifest.json
|
||||||
|
===================================================================
|
||||||
|
--- cockpit.orig/pkg/storaged/manifest.json
|
||||||
|
+++ cockpit/pkg/storaged/manifest.json
|
||||||
|
@@ -14,20 +14,22 @@
|
||||||
|
"docs": [
|
||||||
|
{
|
||||||
|
"label": "Managing partitions",
|
||||||
|
- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/managing-partitions-using-the-web-console_system-management-using-the-rhel-9-web-console"
|
||||||
|
+ "url": "https://documentation.suse.com/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#glue-cockpit-managing-filesystems"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "Managing NFS mounts",
|
||||||
|
- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/managing-nfs-mounts-in-the-web-console_system-management-using-the-rhel-9-web-console"
|
||||||
|
+ "url": "https://documentation.suse.com/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#task-managing-NFS-mounts"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "Managing RAIDs",
|
||||||
|
- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/managing-redundant-arrays-of-independent-disks-in-the-web-console_system-management-using-the-rhel-9-web-console"
|
||||||
|
+ "url": "https://documentation.suse.com/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#id-1.7.6"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "Managing LVMs",
|
||||||
|
- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/using-the-web-console-for-configuring-lvm-logical-volumes_system-management-using-the-rhel-8-web-console"
|
||||||
|
- },
|
||||||
|
+ "url": "https://documentation.suse.com/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#id-1.7.7"
|
||||||
|
+ }
|
||||||
|
+ ],
|
||||||
|
+ "docs-rh": [
|
||||||
|
{
|
||||||
|
"label": "Managing physical drives",
|
||||||
|
"url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/using-the-web-console-for-changing-physical-drives-in-volume-groups_system-management-using-the-rhel-8-web-console"
|
||||||
|
Index: cockpit/pkg/systemd/manifest.json
|
||||||
|
===================================================================
|
||||||
|
--- cockpit.orig/pkg/systemd/manifest.json
|
||||||
|
+++ cockpit/pkg/systemd/manifest.json
|
||||||
|
@@ -12,7 +12,7 @@
|
||||||
|
"docs": [
|
||||||
|
{
|
||||||
|
"label": "Configuring system settings",
|
||||||
|
- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/getting-started-with-the-rhel-9-web-console_system-management-using-the-rhel-9-web-console"
|
||||||
|
+ "url": "https://documentation.suse.com/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#cockpit-configuring-servers"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"keywords": [
|
||||||
|
@@ -35,7 +35,7 @@
|
||||||
|
"docs": [
|
||||||
|
{
|
||||||
|
"label": "Managing services",
|
||||||
|
- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/managing-services-in-the-web-console_system-management-using-the-rhel-9-web-console"
|
||||||
|
+ "url": "https://documentation.suse.com/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#glue-services-management"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"keywords": [
|
||||||
|
@@ -54,7 +54,7 @@
|
||||||
|
"docs": [
|
||||||
|
{
|
||||||
|
"label": "Reviewing logs",
|
||||||
|
- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/reviewing-logs_system-management-using-the-rhel-9-web-console"
|
||||||
|
+ "url": "https://documentation.suse.com/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#cockpit-filtering-logs"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"keywords": [
|
||||||
|
Index: cockpit/pkg/users/manifest.json
|
||||||
|
===================================================================
|
||||||
|
--- cockpit.orig/pkg/users/manifest.json
|
||||||
|
+++ cockpit/pkg/users/manifest.json
|
||||||
|
@@ -6,7 +6,7 @@
|
||||||
|
"docs": [
|
||||||
|
{
|
||||||
|
"label": "Managing user accounts",
|
||||||
|
- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/managing-user-accounts-in-the-web-console_system-management-using-the-rhel-9-web-console"
|
||||||
|
+ "url": "https://documentation.suse.com/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#glue-managing-users"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"keywords": [
|
||||||
|
Index: cockpit/pkg/shell/manifest.json
|
||||||
|
===================================================================
|
||||||
|
--- cockpit.orig/pkg/shell/manifest.json
|
||||||
|
+++ cockpit/pkg/shell/manifest.json
|
||||||
@@ -26,7 +26,7 @@
|
@@ -26,7 +26,7 @@
|
||||||
"zh-cn": "中文(中国)",
|
"zh-cn": "中文(中国)",
|
||||||
"zh-tw": "中文(台灣)"
|
"zh-tw": "中文(台灣)"
|
||||||
@ -70,86 +165,10 @@ index a252e76d9..83be922c7 100644
|
|||||||
{
|
{
|
||||||
"label": "Web Console",
|
"label": "Web Console",
|
||||||
"url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/index"
|
"url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/index"
|
||||||
diff --git a/pkg/storaged/manifest.json b/pkg/storaged/manifest.json
|
@@ -56,4 +56,4 @@
|
||||||
index 8ee17324b..319204a22 100644
|
]
|
||||||
--- a/pkg/storaged/manifest.json
|
}
|
||||||
+++ b/pkg/storaged/manifest.json
|
]
|
||||||
@@ -14,20 +14,22 @@
|
-}
|
||||||
"docs": [
|
+}
|
||||||
{
|
\ No newline at end of file
|
||||||
"label": "Managing partitions",
|
|
||||||
- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/managing-partitions-using-the-web-console_system-management-using-the-rhel-9-web-console"
|
|
||||||
+ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#glue-cockpit-managing-filesystems"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "Managing NFS mounts",
|
|
||||||
- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/managing-nfs-mounts-in-the-web-console_system-management-using-the-rhel-9-web-console"
|
|
||||||
+ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#task-managing-NFS-mounts"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "Managing RAIDs",
|
|
||||||
- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/managing-redundant-arrays-of-independent-disks-in-the-web-console_system-management-using-the-rhel-9-web-console"
|
|
||||||
+ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#id-1.7.6"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "Managing LVMs",
|
|
||||||
- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/using-the-web-console-for-configuring-lvm-logical-volumes_system-management-using-the-rhel-8-web-console"
|
|
||||||
- },
|
|
||||||
+ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#id-1.7.7"
|
|
||||||
+ }
|
|
||||||
+ ],
|
|
||||||
+ "docs-rh": [
|
|
||||||
{
|
|
||||||
"label": "Managing physical drives",
|
|
||||||
"url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/using-the-web-console-for-changing-physical-drives-in-volume-groups_system-management-using-the-rhel-8-web-console"
|
|
||||||
diff --git a/pkg/systemd/manifest.json b/pkg/systemd/manifest.json
|
|
||||||
index bd62a4cb3..5daf0a499 100644
|
|
||||||
--- a/pkg/systemd/manifest.json
|
|
||||||
+++ b/pkg/systemd/manifest.json
|
|
||||||
@@ -12,7 +12,7 @@
|
|
||||||
"docs": [
|
|
||||||
{
|
|
||||||
"label": "Configuring system settings",
|
|
||||||
- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/getting-started-with-the-rhel-9-web-console_system-management-using-the-rhel-9-web-console"
|
|
||||||
+ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#cockpit-configuring-servers"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"keywords": [
|
|
||||||
@@ -35,7 +35,7 @@
|
|
||||||
"docs": [
|
|
||||||
{
|
|
||||||
"label": "Managing services",
|
|
||||||
- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/managing-services-in-the-web-console_system-management-using-the-rhel-9-web-console"
|
|
||||||
+ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#glue-services-management"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"keywords": [
|
|
||||||
@@ -54,7 +54,7 @@
|
|
||||||
"docs": [
|
|
||||||
{
|
|
||||||
"label": "Reviewing logs",
|
|
||||||
- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/reviewing-logs_system-management-using-the-rhel-9-web-console"
|
|
||||||
+ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#cockpit-filtering-logs"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"keywords": [
|
|
||||||
diff --git a/pkg/users/manifest.json b/pkg/users/manifest.json
|
|
||||||
index 04295b6a4..2609d0b2c 100644
|
|
||||||
--- a/pkg/users/manifest.json
|
|
||||||
+++ b/pkg/users/manifest.json
|
|
||||||
@@ -3,10 +3,10 @@
|
|
||||||
"index": {
|
|
||||||
"label": "Accounts",
|
|
||||||
"order": 70,
|
|
||||||
- "docs": [
|
|
||||||
+ "docs-rh": [
|
|
||||||
{
|
|
||||||
"label": "Managing user accounts",
|
|
||||||
- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/managing-user-accounts-in-the-web-console_system-management-using-the-rhel-9-web-console"
|
|
||||||
+ "url": "https://documentation.suse.com/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#glue-managing-users"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"keywords": [
|
|
||||||
--
|
|
||||||
2.46.0
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user