abrooks/cockpit
SHA256
1
0
Fork 0
forked from cockpit/cockpit
Code Pull Requests Activity

Accepting request 1141721 from systemsmanagement:cockpit

Browse Source 
- suse_docs.patch: replace with suse docs and move docs with out eqiv
  to docs-rh (bsc#1219088)
- hide-docs.patch: obsolete by above, removed

- Provide users/groups cockpit-wsinstance and cockpit-ws: they are
  generated by cockpit-ws %pre script.

- hide-docs.patch: hide RHEL docs in shell/manifest.json

- vendor.tar.gz -- submodules in vendor/ subdirectory. These are not part
  of original tarball because obs service wants to bundle node_modules
  there too....

OBS-URL: https://build.opensuse.org/request/show/1141721
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cockpit?expand=0&rev=39
This commit is contained in:
Ana Guerrero 2024-01-26 21:46:26 +00:00 committed by Git OBS Bridge
commit ea9f15ca2a
4 changed files with 200 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cockpit.changes
View File

@ -1,7 +1,28 @@
-------------------------------------------------------------------
Thu Jan 25 09:36:45 UTC 2024 - Luna D Dragon <luna.dragon@suse.com>
- suse_docs.patch: replace with suse docs and move docs with out eqiv
to docs-rh (bsc#1219088)
- hide-docs.patch: obsolete by above, removed
-------------------------------------------------------------------
Thu Jan 25 09:08:12 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Provide users/groups cockpit-wsinstance and cockpit-ws: they are
generated by cockpit-ws %pre script.
-------------------------------------------------------------------
Wed Jan 24 12:55:20 UTC 2024 - Adam Majer <adam.majer@suse.de>
- hide-docs.patch: hide RHEL docs in shell/manifest.json
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 12 16:40:17 UTC 2024 - Adam Majer <adam.majer@suse.de> Fri Jan 12 16:40:17 UTC 2024 - Adam Majer <adam.majer@suse.de>
- enable python-bridge for suse distros - enable python-bridge for suse distros
- vendor.tar.gz -- submodules in vendor/ subdirectory. These are not part
of original tarball because obs service wants to bundle node_modules
there too....
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Dec 21 15:22:27 UTC 2023 - Adam Majer <adam.majer@suse.de> - 307 Thu Dec 21 15:22:27 UTC 2023 - Adam Majer <adam.majer@suse.de> - 307

6
cockpit.spec
View File

@ -62,7 +62,7 @@ Source98: package-lock.json
Source97: node_modules.spec.inc Source97: node_modules.spec.inc
%include %{_sourcedir}/node_modules.spec.inc %include %{_sourcedir}/node_modules.spec.inc
Patch1: 0001-selinux-allow-login-to-read-motd-file.patch Patch1: 0001-selinux-allow-login-to-read-motd-file.patch
Patch2: hide-docs.patch Patch2: suse_docs.patch
Patch3: suse-microos-branding.patch Patch3: suse-microos-branding.patch
Patch4: css-overrides.patch Patch4: css-overrides.patch
Patch5: storage-btrfs.patch Patch5: storage-btrfs.patch
@ -602,6 +602,10 @@ Requires: wallpaper-branding
%endif %endif
# for cockpit-desktop # for cockpit-desktop
Suggests: python3 Suggests: python3
Provides: group(cockpit-ws)
Provides: group(cockpit-wsinstance)
Provides: user(cockpit-ws)
Provides: user(cockpit-wsinstance)
# prevent hard python3 dependency for cockpit-desktop, it falls back to other browsers # prevent hard python3 dependency for cockpit-desktop, it falls back to other browsers
%global __requires_exclude_from ^%{_libexecdir}/cockpit-client$ %global __requires_exclude_from ^%{_libexecdir}/cockpit-client$

111
hide-docs.patch
View File

@ -1,111 +0,0 @@
From cf16dead8c862fdf0f61a1c7ac0e8804933c812a Mon Sep 17 00:00:00 2001
From: Jacek Tomasiak <jacek.tomasiak@gmail.com>
Date: Mon, 14 Mar 2022 12:02:17 +0100
Subject: [PATCH] Hide links pointing to RHEL docs (bsc#1197003)
---
pkg/kdump/manifest.json | 2 +-
pkg/networkmanager/manifest.json | 2 +-
pkg/packagekit/manifest.json | 2 +-
pkg/shell/indexes.js | 2 +-
pkg/storaged/manifest.json | 2 +-
pkg/systemd/manifest.json | 6 +++---
pkg/users/manifest.json | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
Index: cockpit/pkg/kdump/manifest.json
===================================================================
--- cockpit.orig/pkg/kdump/manifest.json
+++ cockpit/pkg/kdump/manifest.json
@@ -5,7 +5,7 @@
"tools": {
"index": {
"label": "Kernel dump",
- "docs": [
+ "docs-rh": [
{
"label": "Configuring kdump",
"url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/configuring-kdump-in-the-web-console_system-management-using-the-rhel-8-web-console"
Index: cockpit/pkg/networkmanager/manifest.json
===================================================================
--- cockpit.orig/pkg/networkmanager/manifest.json
+++ cockpit/pkg/networkmanager/manifest.json
@@ -7,7 +7,7 @@
"index": {
"label": "Networking",
"order": 40,
- "docs": [
+ "docs-rh": [
{
"label": "Managing networking bonds",
"url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/configuring-network-bonds-using-the-web-console_system-management-using-the-rhel-8-web-console"
Index: cockpit/pkg/packagekit/manifest.json
===================================================================
--- cockpit.orig/pkg/packagekit/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/8/html/managing_systems_using_the_rhel_8_web_console/managing-software-updates-in-the-web-console_system-management-using-the-rhel-8-web-console"
Index: cockpit/pkg/storaged/manifest.json
===================================================================
--- cockpit.orig/pkg/storaged/manifest.json
+++ cockpit/pkg/storaged/manifest.json
@@ -11,7 +11,7 @@
"index": {
"label": "Storage",
"order": 30,
- "docs": [
+ "docs-rh": [
{
"label": "Managing partitions",
"url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/managing-partitions-using-the-web-console_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
@@ -9,7 +9,7 @@
"index": {
"label": "Overview",
"order": 10,
- "docs": [
+ "docs-rh": [
{
"label": "Configuring system settings",
"url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/getting-started-with-the-rhel-8-web-console_system-management-using-the-rhel-8-web-console"
@@ -32,7 +32,7 @@
"services": {
"label": "Services",
"order": 100,
- "docs": [
+ "docs-rh": [
{
"label": "Managing services",
"url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/managing-services-in-the-web-console_system-management-using-the-rhel-8-web-console"
@@ -51,7 +51,7 @@
"logs": {
"label": "Logs",
"order": 20,
- "docs": [
+ "docs-rh": [
{
"label": "Reviewing logs",
"url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/reviewing-logs_system-management-using-the-rhel-8-web-console"
Index: cockpit/pkg/users/manifest.json
===================================================================
--- cockpit.orig/pkg/users/manifest.json
+++ cockpit/pkg/users/manifest.json
@@ -3,7 +3,7 @@
"index": {
"label": "Accounts",
"order": 70,
- "docs": [
+ "docs-rh": [
{
"label": "Managing user accounts",
"url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/managing-user-accounts-in-the-web-console_system-management-using-the-rhel-8-web-console"

174
suse_docs.patch Normal file
View File

@ -0,0 +1,174 @@
From adadbac839dc6d549a3a9b75ae1f8c422e82fa7c Mon Sep 17 00:00:00 2001
From: Luna <luna.dragon@suse.com>
Date: Thu, 25 Jan 2024 10:06:03 +0530
Subject: [PATCH] replace with suse docs and move docs with out eqiv to docs-rh
​
---
node_modules | 2 +-
pkg/networkmanager/manifest.json | 19 +++++++++++--------
pkg/shell/manifest.json | 4 ++--
pkg/storaged/manifest.json | 12 +++++++-----
pkg/systemd/manifest.json | 6 +++---
pkg/users/manifest.json | 2 +-
6 files changed, 25 insertions(+), 20 deletions(-)
Index: cockpit/pkg/kdump/manifest.json
===================================================================
--- cockpit.orig/pkg/kdump/manifest.json
+++ cockpit/pkg/kdump/manifest.json
@@ -5,7 +5,7 @@
"tools": {
"index": {
"label": "Kernel dump",
- "docs": [
+ "docs-rh": [
{
"label": "Configuring kdump",
"url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/configuring-kdump-in-the-web-console_system-management-using-the-rhel-8-web-console"
Index: cockpit/pkg/networkmanager/manifest.json
===================================================================
--- cockpit.orig/pkg/networkmanager/manifest.json
+++ cockpit/pkg/networkmanager/manifest.json
@@ -10,23 +10,25 @@
"docs": [
{
"label": "Managing networking bonds",
- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/configuring-network-bonds-using-the-web-console_system-management-using-the-rhel-8-web-console"
- },
- {
- "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"
+ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#cockpit-managing-bonds"
},
{
"label": "Managing networking bridges",
- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/configuring-network-bridges-in-the-web-console_system-management-using-the-rhel-8-web-console"
+ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#task-managing-bridges"
},
{
"label": "Managing VLANs",
- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/configuring-vlans-in-the-web-console_system-management-using-the-rhel-8-web-console"
+ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#task-managing-vlans"
},
{
"label": "Managing firewall",
- "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_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"
+ }
+ ],
+ "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": [
Index: cockpit/pkg/packagekit/manifest.json
===================================================================
--- cockpit.orig/pkg/packagekit/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/8/html/managing_systems_using_the_rhel_8_web_console/managing-software-updates-in-the-web-console_system-management-using-the-rhel-8-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/8/html/managing_systems_using_the_rhel_8_web_console/managing-partitions-using-the-web-console_system-management-using-the-rhel-8-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/8/html/managing_systems_using_the_rhel_8_web_console/managing-nfs-mounts-in-the-web-console_system-management-using-the-rhel-8-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/8/html/managing_systems_using_the_rhel_8_web_console/managing-redundant-arrays-of-independent-disks-in-the-web-console_system-management-using-the-rhel-8-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/8/html/managing_systems_using_the_rhel_8_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/8/html/managing_systems_using_the_rhel_8_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/8/html/managing_systems_using_the_rhel_8_web_console/getting-started-with-the-rhel-8-web-console_system-management-using-the-rhel-8-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/8/html/managing_systems_using_the_rhel_8_web_console/managing-services-in-the-web-console_system-management-using-the-rhel-8-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/8/html/managing_systems_using_the_rhel_8_web_console/reviewing-logs_system-management-using-the-rhel-8-web-console"
+ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/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/8/html/managing_systems_using_the_rhel_8_web_console/managing-user-accounts-in-the-web-console_system-management-using-the-rhel-8-web-console"
+ "url": "https://documentation.suse.com/smart/systems-management/html/cockpit-slemicro/index.html#glue-managing-users"
}
],
"keywords": [
Index: cockpit/pkg/shell/manifest.json
===================================================================
--- cockpit.orig/pkg/shell/manifest.json
+++ cockpit/pkg/shell/manifest.json
@@ -25,7 +25,7 @@
"uk-ua": "Українська",
"zh-cn": "中文（中国）"
},
- "docs": [
+ "docs-rh": [
{
"label": "Web Console",
"url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/managing_systems_using_the_rhel_8_web_console/index"
@@ -55,4 +55,4 @@
]
}
]
-}
+}
\ No newline at end of file