forked from cockpit/cockpit
Compare commits
2 Commits
update-doc
...
micro-6.0
| Author | SHA256 | Date | |
|---|---|---|---|
7a8f537c80
|
|||
2098f3b22a
|
@@ -1,12 +0,0 @@
|
||||
diff --git c/src/systemd/cockpit.socket.in w/src/systemd/cockpit.socket.in
|
||||
index de45b0dc9..a1dccef7f 100644
|
||||
--- c/src/systemd/cockpit.socket.in
|
||||
+++ w/src/systemd/cockpit.socket.in
|
||||
@@ -5,6 +5,7 @@ Wants=cockpit-issue.service
|
||||
|
||||
[Socket]
|
||||
ListenStream=9090
|
||||
+ExecStartPre=@libexecdir@/check_cockpit_users
|
||||
ExecStartPost=-@datadir@/@PACKAGE@/issue/update-issue '' localhost
|
||||
ExecStartPost=-/bin/ln -snf active.issue /run/cockpit/issue
|
||||
ExecStopPost=-/bin/ln -snf inactive.issue /run/cockpit/issue
|
||||
@@ -1,35 +0,0 @@
|
||||
#!/bin/sh
|
||||
bad_users_groups=("cockpit-wsinstance-socket" "cockpit-session-socket")
|
||||
failed=false
|
||||
|
||||
for gu in "${bad_users_groups[@]}"; do
|
||||
grep -q "$gu" /etc/passwd
|
||||
if [ $? -eq 0 ]; then
|
||||
echo "user ${gu} exists, cockpit will fail to start up if this user exists, please run userdel ${gu} to resolve this"
|
||||
failed=true
|
||||
fi
|
||||
|
||||
grep -q "$gu" /etc/group
|
||||
if [ $? -eq 0 ]; then
|
||||
echo "group ${gu} exists, cockpit will fail to start up if this group exists, please run groupdel ${gu} to resolve this"
|
||||
failed=true
|
||||
fi
|
||||
done
|
||||
|
||||
grep -q cockpit-systemd-service /etc/passwd
|
||||
if [ $? -eq 0 ]; then
|
||||
echo "user cockpit-systemd-service exists, cockpit will fail to start up if this group exists, please run userdel cockpit-systemd-service to resolve this"
|
||||
failed=true
|
||||
fi
|
||||
|
||||
if [ -f /etc/nsswitch.conf ]; then
|
||||
grep -Eq "passwd:.*systemd" /etc/nsswitch.conf
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "/etc/nsswitch.conf is out of date, please update it from /usr/etc/nsswitch.conf to use cockpit"
|
||||
failed=true
|
||||
fi
|
||||
fi
|
||||
|
||||
if $failed; then
|
||||
exit 1
|
||||
fi
|
||||
@@ -1,12 +1,7 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 23 10:47:06 UTC 2025 - Alice Brooks <alice.brooks@suse.com>
|
||||
Tue Sep 23 09:11:48 UTC 2025 - Luna D Dragon <luna.dragon@suse.com>
|
||||
|
||||
- Update documentation to the latest release bsc#1226050
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 23 09:35:29 UTC 2025 - Alice Brooks <alice.brooks@suse.com>
|
||||
|
||||
- Update suse_docs.patch to use 6.2 docs instead of 6.0
|
||||
- add requirement on python3-pcp if pcp is installed bsc#1239759
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 18 07:40:59 UTC 2025 - Alice Brooks <alice.brooks@suse.com>
|
||||
|
||||
24
cockpit.spec
24
cockpit.spec
@@ -38,13 +38,8 @@
|
||||
|
||||
%define __lib lib
|
||||
|
||||
%if 0%{?suse_version} > 1500
|
||||
%define pamconfdir %{_pam_vendordir}
|
||||
%define pamconfig tools/cockpit.suse.pam
|
||||
%else
|
||||
%define pamconfdir %{_sysconfdir}/pam.d
|
||||
%define pamconfig tools/cockpit.pam
|
||||
%endif
|
||||
|
||||
%if %{defined _pamdir}
|
||||
%define pamdir %{_pamdir}
|
||||
@@ -64,7 +59,6 @@ Source0: cockpit-%{version}.tar.gz
|
||||
Source2: cockpit-rpmlintrc
|
||||
Source3: cockpit-suse-theme.tar
|
||||
Source4: cockpit-no-pamoath.pam
|
||||
Source5: check_cockpit_users
|
||||
Source10: update_version.sh
|
||||
Source99: README.packaging
|
||||
Source98: package-lock.json
|
||||
@@ -86,7 +80,6 @@ Patch104: selinux_libdir.patch
|
||||
Patch105: fix-libexecdir.patch
|
||||
Patch106: packagekit-single-install.patch
|
||||
Patch109: 0008-pybridge-endian-flag.patch
|
||||
Patch110: add_preexec_cockpit.patch
|
||||
Patch111: 0001-cockpit-overview-support-SUSE_SUPPORT_PRODUCT-keys.patch
|
||||
Patch112: 0002-cockpit-kdump-support-SLE-micro-6.2.patch
|
||||
Patch113: 0003-branding-use-SUSE_SUPPORT_PRODUCT-and-SUSE_SUPPORT_P.patch
|
||||
@@ -198,7 +191,6 @@ Requires: cockpit-system
|
||||
Recommends: (cockpit-storaged if udisks2)
|
||||
Recommends: (cockpit-packagekit if (dnf or zypper))
|
||||
Recommends: (cockpit-firewalld if firewalld)
|
||||
Suggests: python3-pcp
|
||||
|
||||
%if 0%{?rhel} == 0
|
||||
Recommends: (cockpit-networkmanager if NetworkManager)
|
||||
@@ -237,6 +229,7 @@ BuildRequires: python3-pytest-timeout
|
||||
%patch -P 106 -p1
|
||||
%patch -P 109 -p1
|
||||
%patch -P 114 -p1
|
||||
%patch -P 108 -p1
|
||||
|
||||
# SLE Micro specific patches
|
||||
%if 0%{?is_smo}
|
||||
@@ -256,7 +249,6 @@ BuildRequires: python3-pytest-timeout
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} >= 1600
|
||||
%patch -P 110 -p1
|
||||
%if !0%{?is_opensuse}
|
||||
%patch -P 111 -p1
|
||||
%patch -P 112 -p1
|
||||
@@ -461,12 +453,6 @@ rm -f %{buildroot}%{_datadir}/pixmaps/cockpit-sosreport.png
|
||||
mkdir -p %{buildroot}%{_datadir}/cockpit/devel
|
||||
cp -a pkg/lib %{buildroot}%{_datadir}/cockpit/devel
|
||||
|
||||
# cockpit.socket preexec to ensure users are created as dynamic users
|
||||
|
||||
%if 0%{?suse_version} >= 1600
|
||||
install -D -m 755 %SOURCE5 %{buildroot}%{_libexecdir}/
|
||||
%endif
|
||||
|
||||
# -------------------------------------------------------------------------------
|
||||
# Sub-packages
|
||||
|
||||
@@ -533,6 +519,7 @@ Requires: jeos-firstboot
|
||||
Requires: /usr/bin/pwscore
|
||||
Requires: /usr/bin/date
|
||||
Requires: (sudo or polkit)
|
||||
Requires: (python3-pcp if pcp)
|
||||
Provides: cockpit-shell = %{version}-%{release}
|
||||
Provides: cockpit-systemd = %{version}-%{release}
|
||||
Provides: cockpit-tuned = %{version}-%{release}
|
||||
@@ -545,7 +532,6 @@ Recommends: PackageKit
|
||||
Recommends: setroubleshoot-server >= 3.3.3
|
||||
Recommends: kexec-tools
|
||||
Suggests: NetworkManager-team
|
||||
Suggests: python3-pcp
|
||||
Provides: cockpit-kdump = %{version}-%{release}
|
||||
Provides: cockpit-networkmanager = %{version}-%{release}
|
||||
Provides: cockpit-selinux = %{version}-%{release}
|
||||
@@ -582,9 +568,6 @@ Suggests: sssd-dbus
|
||||
%if 0%{?suse_version}
|
||||
Requires(pre): permissions
|
||||
Requires: distribution-logos
|
||||
%if 0%{?suse_version} > 1500
|
||||
Requires: pam_oath >= 2.6.11.12
|
||||
%endif
|
||||
Requires: wallpaper-branding
|
||||
%endif
|
||||
# for cockpit-desktop
|
||||
@@ -657,13 +640,11 @@ authentication via sssd/FreeIPA.
|
||||
%if 0%{?suse_version} == 1500
|
||||
%{?suse_version:%verify(not mode) }%attr(4750, root, cockpit-wsinstance-socket) %{_libexecdir}/cockpit-session
|
||||
%else
|
||||
%{_libexecdir}/check_cockpit_users
|
||||
%{_libexecdir}/cockpit-session
|
||||
%endif
|
||||
%{_datadir}/cockpit/branding
|
||||
|
||||
%pre ws
|
||||
%if 0%{?suse_version} == 1500
|
||||
# HACK: old RPM and even Fedora's current RPM don't properly support sysusers
|
||||
# https://github.com/rpm-software-management/rpm/issues/3073
|
||||
getent group cockpit-wsinstance-socket >/dev/null || groupadd -r cockpit-wsinstance-socket
|
||||
@@ -671,7 +652,6 @@ getent group cockpit-session-socket >/dev/null || groupadd -r cockpit-session-so
|
||||
getent passwd cockpit-wsinstance-socket >/dev/null || useradd -r -g cockpit-wsinstance-socket -d /nonexisting -s /sbin/nologin -c "User for cockpit-ws instances" cockpit-wsinstance-socket
|
||||
getent passwd cockpit-session-socket >/dev/null || useradd -r -g cockpit-session-socket -d /nonexisting -s /sbin/nologin -c "User for cockpit-session instances" cockpit-session-socket
|
||||
getent passwd cockpit-systemd-service >/dev/null || useradd -r -g cockpit-wsinstance-socket -d /nonexisting -s /sbin/nologin -c "User for cockpit.service" cockpit-systemd-service
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} > 1500
|
||||
# Prepare for migration to /usr/lib; save any old .rpmsave
|
||||
|
||||
@@ -39,23 +39,23 @@ index fa9b2799c..cfa237c2b 100644
|
||||
- {
|
||||
- "label": "Managing networking teams",
|
||||
- "url": "https://docs.redhat.com/en/documentation/red_hat_enterprise_linux/9/html/configuring_and_managing_networking/configuring-network-teaming_configuring-and-managing-networking#proc_configuring-a-network-team-by-using-the-rhel-web-console_configuring-network-teaming"
|
||||
+ "url": "https://documentation.suse.com/sle-micro/6.1/html/Micro-cockpit/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",
|
||||
- "url": "https://docs.redhat.com/en/documentation/red_hat_enterprise_linux/9/html/configuring_and_managing_networking/configuring-a-network-bridge_configuring-and-managing-networking#proc_configuring-a-network-bridge-by-using-the-rhel-web-console_configuring-a-network-bridge"
|
||||
+ "url": "https://documentation.suse.com/sle-micro/6.1/html/Micro-cockpit/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",
|
||||
- "url": "https://docs.redhat.com/en/documentation/red_hat_enterprise_linux/9/html/configuring_and_managing_networking/configuring-vlan-tagging_configuring-and-managing-networking#proc_configuring-vlan-tagging-by-using-the-rhel-web-console_configuring-vlan-tagging"
|
||||
+ "url": "https://documentation.suse.com/sle-micro/6.1/html/Micro-cockpit/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",
|
||||
- "url": "https://docs.redhat.com/en/documentation/red_hat_enterprise_linux/9/html/configuring_firewalls_and_packet_filters/using-and-configuring-firewalld_firewall-packet-filters#enabling-services-on-firewall-using-the-web-console_controlling-network-traffic-using-firewalld"
|
||||
+ "url": "https://documentation.suse.com/sle-micro/6.1/html/Micro-cockpit/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": [
|
||||
@@ -102,23 +102,23 @@ index fac446117..27977253d 100644
|
||||
{
|
||||
"label": "Managing partitions",
|
||||
- "url": "https://docs.redhat.com/en/documentation/red_hat_enterprise_linux/9/html/managing_file_systems/managing-partitions-using-the-web-console_managing-file-systems"
|
||||
+ "url": "https://documentation.suse.com/sle-micro/6.1/html/Micro-cockpit/index.html#glue-cockpit-managing-filesystems"
|
||||
+ "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://docs.redhat.com/en/documentation/red_hat_enterprise_linux/9/html/managing_file_systems/mounting-nfs-shares_managing-file-systems#connecting-nfs-mounts-in-the-web-console_mounting-nfs-shares"
|
||||
+ "url": "https://documentation.suse.com/sle-micro/6.1/html/Micro-cockpit/index.html#task-managing-NFS-mounts"
|
||||
+ "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://docs.redhat.com/en/documentation/red_hat_enterprise_linux/9/html/managing_storage_devices/managing-raid_managing-storage-devices#creating-raid-in-the-web-console_managing-raid"
|
||||
+ "url": "https://documentation.suse.com/sle-micro/6.1/html/Micro-cockpit/index.html#id-1.7.6"
|
||||
+ "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://docs.redhat.com/en/documentation/red_hat_enterprise_linux/9/html/configuring_and_managing_logical_volumes/index"
|
||||
- },
|
||||
+ "url": "https://documentation.suse.com/sle-micro/6.1/html/Micro-cockpit/index.html#id-1.7.7"
|
||||
+ "url": "https://documentation.suse.com/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#id-1.7.7"
|
||||
+ }
|
||||
+ ],
|
||||
+ "docs-rh": [
|
||||
@@ -134,7 +134,7 @@ index d4b59ab0d..4bcf70e65 100644
|
||||
{
|
||||
"label": "Configuring system settings",
|
||||
- "url": "https://docs.redhat.com/en/documentation/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/index"
|
||||
+ "url": "https://documentation.suse.com/sle-micro/6.1/html/Micro-cockpit/index.html#cockpit-configuring-servers"
|
||||
+ "url": "https://documentation.suse.com/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#cockpit-configuring-servers"
|
||||
}
|
||||
],
|
||||
"keywords": [
|
||||
@@ -143,7 +143,7 @@ index d4b59ab0d..4bcf70e65 100644
|
||||
{
|
||||
"label": "Managing services",
|
||||
- "url": "https://docs.redhat.com/en/documentation/red_hat_enterprise_linux/9/html/managing_systems_using_the_rhel_9_web_console/index"
|
||||
+ "url": "https://documentation.suse.com/sle-micro/6.1/html/Micro-cockpit/index.html#glue-services-management"
|
||||
+ "url": "https://documentation.suse.com/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#glue-services-management"
|
||||
}
|
||||
],
|
||||
"keywords": [
|
||||
@@ -152,7 +152,7 @@ index d4b59ab0d..4bcf70e65 100644
|
||||
{
|
||||
"label": "Reviewing logs",
|
||||
- "url": "https://docs.redhat.com/en/documentation/red_hat_enterprise_linux/9/html/configuring_basic_system_settings/assembly_troubleshooting-problems-using-log-files_configuring-basic-system-settings#reviewing-logs-in-the-web-console_reviewing-logs"
|
||||
+ "url": "https://documentation.suse.com/sle-micro/6.1/html/Micro-cockpit/index.html#cockpit-filtering-logs"
|
||||
+ "url": "https://documentation.suse.com/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#cockpit-filtering-logs"
|
||||
}
|
||||
],
|
||||
"keywords": [
|
||||
@@ -165,7 +165,7 @@ index 1f181afc5..b176b14d0 100644
|
||||
{
|
||||
"label": "Managing user accounts",
|
||||
- "url": "https://docs.redhat.com/en/documentation/red_hat_enterprise_linux/9/html/configuring_basic_system_settings/managing-users-and-groups_configuring-basic-system-settings#managing-user-accounts-in-the-web-console_managing-users-and-groups"
|
||||
+ "url": "https://documentation.suse.com/sle-micro/6.1/html/Micro-cockpit/index.html#glue-managing-users"
|
||||
+ "url": "https://documentation.suse.com/sle-micro/6.0/html/Micro-6.0-cockpit/index.html#glue-managing-users"
|
||||
}
|
||||
],
|
||||
"keywords": [
|
||||
|
||||
Reference in New Issue
Block a user