Compare commits
17 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a437de7c91 | ||
|
|
d8fb649535 | ||
|
|
fe1df010c5 | ||
|
|
c5d8dbc5af | ||
|
|
a57c62da6c | ||
|
|
19bb6b3320 | ||
|
|
49d748a73a | ||
|
|
a0cf013e9e | ||
|
|
0780fe592c | ||
|
|
3025b3da66 | ||
|
|
b85940e856 | ||
|
|
b49cdd5cd7 | ||
|
|
6f06896f5c | ||
|
|
11806258cb | ||
|
|
8da824c275 | ||
|
|
b683d58792 | ||
|
|
90816ff24e |
9 changed files with 73 additions and 82 deletions
1
.fmf/version
Normal file
1
.fmf/version
Normal file
|
|
@ -0,0 +1 @@
|
|||
1
|
||||
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -4,3 +4,6 @@
|
|||
/corosync-qdevice-2.93.0.tar.gz
|
||||
/corosync-qdevice-3.0.0.tar.gz
|
||||
/corosync-qdevice-3.0.1.tar.gz
|
||||
/corosync-qdevice-3.0.2.tar.gz
|
||||
/corosync-qdevice-3.0.3.tar.gz
|
||||
/corosync-qdevice-3.0.4.tar.gz
|
||||
|
|
|
|||
|
|
@ -3,32 +3,23 @@
|
|||
# to disable or enable specific features
|
||||
%bcond_without userflags
|
||||
%bcond_with runautogen
|
||||
%bcond_without systemd
|
||||
|
||||
%global gitver %{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}
|
||||
%global gittarver %{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}
|
||||
|
||||
Name: corosync-qdevice
|
||||
Summary: The Corosync Cluster Engine Qdevice
|
||||
Version: 3.0.1
|
||||
Release: 2%{?gitver}%{?dist}
|
||||
License: BSD
|
||||
Version: 3.0.4
|
||||
Release: 1%{?dist}
|
||||
License: BSD-3-Clause
|
||||
URL: https://github.com/corosync/corosync-qdevice
|
||||
Source0: https://github.com/corosync/corosync-qdevice/releases/download/v%{version}%{?gittarver}/%{name}-%{version}%{?gittarver}.tar.gz
|
||||
Source0: https://github.com/corosync/corosync-qdevice/releases/download/v%{version}/%{name}-%{version}.tar.gz
|
||||
|
||||
# Runtime bits
|
||||
Requires: corosync >= 2.4.0
|
||||
Requires: corosynclib >= 2.4.0
|
||||
Requires: nss-tools
|
||||
|
||||
%if %{with systemd}
|
||||
%{?systemd_requires}
|
||||
BuildRequires: systemd
|
||||
BuildRequires: systemd-devel
|
||||
%else
|
||||
Requires(post): /sbin/chkconfig
|
||||
Requires(preun): /sbin/chkconfig
|
||||
%endif
|
||||
|
||||
# Build bits
|
||||
BuildRequires: gcc
|
||||
|
|
@ -42,9 +33,10 @@ BuildRequires: nss-devel
|
|||
BuildRequires: autoconf automake libtool
|
||||
%endif
|
||||
BuildRequires: make
|
||||
BuildRequires: git
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}%{?gittarver}
|
||||
%autosetup -S git_am
|
||||
|
||||
%build
|
||||
%if %{with runautogen}
|
||||
|
|
@ -55,9 +47,7 @@ BuildRequires: make
|
|||
%if %{with userflags}
|
||||
--enable-user-flags \
|
||||
%endif
|
||||
%if %{with systemd}
|
||||
--enable-systemd \
|
||||
%endif
|
||||
--enable-qdevices \
|
||||
--enable-qnetd \
|
||||
--with-initddir=%{_initrddir} \
|
||||
|
|
@ -80,41 +70,23 @@ install -p -m 644 init/corosync-qdevice.sysconfig.example \
|
|||
install -p -m 644 init/corosync-qnetd.sysconfig.example \
|
||||
%{buildroot}%{_sysconfdir}/sysconfig/corosync-qnetd
|
||||
|
||||
%if %{with systemd}
|
||||
sed -i -e 's/^#User=/User=/' \
|
||||
%{buildroot}%{_unitdir}/corosync-qnetd.service
|
||||
%else
|
||||
sed -i -e 's/^COROSYNC_QNETD_RUNAS=""$/COROSYNC_QNETD_RUNAS="coroqnetd"/' \
|
||||
%{buildroot}%{_sysconfdir}/sysconfig/corosync-qnetd
|
||||
%endif
|
||||
|
||||
install -m0644 -D init/corosync-qnetd.sysusers.conf.example %{buildroot}%{_sysusersdir}/corosync-qnetd.conf
|
||||
|
||||
%description
|
||||
This package contains the Corosync Cluster Engine Qdevice, script for creating
|
||||
NSS certificates and an init script.
|
||||
|
||||
%post
|
||||
%if %{with systemd} && 0%{?systemd_post:1}
|
||||
%systemd_post corosync-qdevice.service
|
||||
%else
|
||||
if [ $1 -eq 1 ]; then
|
||||
/sbin/chkconfig --add corosync-qdevice || :
|
||||
fi
|
||||
%endif
|
||||
|
||||
%preun
|
||||
%if %{with systemd} && 0%{?systemd_preun:1}
|
||||
%systemd_preun corosync-qdevice.service
|
||||
%else
|
||||
if [ $1 -eq 0 ]; then
|
||||
/sbin/service corosync-qdevice stop &>/dev/null || :
|
||||
/sbin/chkconfig --del corosync-qdevice || :
|
||||
fi
|
||||
%endif
|
||||
|
||||
%postun
|
||||
%if %{with systemd} && 0%{?systemd_postun:1}
|
||||
%systemd_postun corosync-qdevice.service
|
||||
%endif
|
||||
|
||||
%files
|
||||
%license LICENSE
|
||||
|
|
@ -125,11 +97,7 @@ fi
|
|||
%{_sbindir}/corosync-qdevice-net-certutil
|
||||
%{_sbindir}/corosync-qdevice-tool
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/corosync-qdevice
|
||||
%if %{with systemd}
|
||||
%{_unitdir}/corosync-qdevice.service
|
||||
%else
|
||||
%{_initrddir}/corosync-qdevice
|
||||
%endif
|
||||
%{_mandir}/man8/corosync-qdevice-tool.8*
|
||||
%{_mandir}/man8/corosync-qdevice-net-certutil.8*
|
||||
%{_mandir}/man8/corosync-qdevice.8*
|
||||
|
|
@ -149,45 +117,22 @@ The Corosync Cluster Engine Qdevice
|
|||
%package -n corosync-qnetd
|
||||
Summary: The Corosync Cluster Engine Qdevice Network Daemon
|
||||
Requires: nss-tools
|
||||
Requires(pre): shadow-utils
|
||||
|
||||
%if %{with systemd}
|
||||
%{?systemd_requires}
|
||||
%endif
|
||||
|
||||
%description -n corosync-qnetd
|
||||
This package contains the Corosync Cluster Engine Qdevice Network Daemon,
|
||||
script for creating NSS certificates and an init script.
|
||||
|
||||
%pre -n corosync-qnetd
|
||||
getent group coroqnetd >/dev/null || groupadd -r coroqnetd
|
||||
getent passwd coroqnetd >/dev/null || \
|
||||
useradd -r -g coroqnetd -d / -s /sbin/nologin -c "User for corosync-qnetd" coroqnetd
|
||||
exit 0
|
||||
|
||||
%post -n corosync-qnetd
|
||||
%if %{with systemd} && 0%{?systemd_post:1}
|
||||
%systemd_post corosync-qnetd.service
|
||||
%else
|
||||
if [ $1 -eq 1 ]; then
|
||||
/sbin/chkconfig --add corosync-qnetd || :
|
||||
fi
|
||||
%endif
|
||||
|
||||
%preun -n corosync-qnetd
|
||||
%if %{with systemd} && 0%{?systemd_preun:1}
|
||||
%systemd_preun corosync-qnetd.service
|
||||
%else
|
||||
if [ $1 -eq 0 ]; then
|
||||
/sbin/service corosync-qnetd stop &>/dev/null || :
|
||||
/sbin/chkconfig --del corosync-qnetd || :
|
||||
fi
|
||||
%endif
|
||||
|
||||
%postun -n corosync-qnetd
|
||||
%if %{with systemd} && 0%{?systemd_postun:1}
|
||||
%systemd_postun corosync-qnetd.service
|
||||
%endif
|
||||
|
||||
%files -n corosync-qnetd
|
||||
%license LICENSE
|
||||
|
|
@ -197,16 +142,59 @@ fi
|
|||
%{_bindir}/corosync-qnetd-certutil
|
||||
%{_bindir}/corosync-qnetd-tool
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/corosync-qnetd
|
||||
%if %{with systemd}
|
||||
%{_unitdir}/corosync-qnetd.service
|
||||
%else
|
||||
%{_initrddir}/corosync-qnetd
|
||||
%endif
|
||||
%{_mandir}/man8/corosync-qnetd-tool.8*
|
||||
%{_mandir}/man8/corosync-qnetd-certutil.8*
|
||||
%{_mandir}/man8/corosync-qnetd.8*
|
||||
%{_sysusersdir}/corosync-qnetd.conf
|
||||
|
||||
%changelog
|
||||
* Tue Nov 25 2025 Jan Friesse <jfriesse@redhat.com> - 3.0.4-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Tue Feb 11 2025 Jan Friesse <jfriesse@redhat.com> - 3.0.3-9
|
||||
- Change sysusers.d config file name to corosync-qnetd.conf
|
||||
- Remove support for non-systemd builds
|
||||
|
||||
* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.0.3-8
|
||||
- Add sysusers.d config file to allow rpm to create users/groups automatically
|
||||
|
||||
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Tue Jun 06 2023 Jan Friesse <jfriesse@redhat.com> - 3.0.3-2
|
||||
- migrated to SPDX license
|
||||
|
||||
* Wed Mar 22 2023 Jan Friesse <jfriesse@redhat.com> - 3.0.3-1
|
||||
- New upstream release
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Thu Nov 03 2022 Jan Friesse <jfriesse@redhat.com> - 3.0.2-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (corosync-qdevice-3.0.1.tar.gz) = 677aff51b5b3cae693ccf342494077cb5ee5ba16ff71c6d8da17f5ab54bc31e0df5c8e0fd4292125c0bffeaa25371d58360a7ec8b122534f92818d3658b46c98
|
||||
SHA512 (corosync-qdevice-3.0.4.tar.gz) = a7e2e1fcab699c6deb0ae01725df6a1d3870c0f874b7dff96f657ac3e0d9fadb682ae145d6a9d29c592ca8f34ad12b8523c6adf9b14b0a01e59d998d8cb8c25f
|
||||
|
|
|
|||
3
tests/.gitignore
vendored
3
tests/.gitignore
vendored
|
|
@ -1,3 +0,0 @@
|
|||
# Ignore tests runs/artefacts.
|
||||
artifacts/**
|
||||
**/*.retry
|
||||
11
tests/plan.fmf
Normal file
11
tests/plan.fmf
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
summary: Run all smoke tests
|
||||
discover:
|
||||
how: fmf
|
||||
execute:
|
||||
how: tmt
|
||||
prepare:
|
||||
how: install
|
||||
package:
|
||||
- iproute
|
||||
- corosync-qdevice
|
||||
- corosync-qnetd
|
||||
2
tests/smoke/main.fmf
Normal file
2
tests/smoke/main.fmf
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
summary: Basic smoke test
|
||||
test: ./runtest.sh
|
||||
0
tests/smoke/runtest.sh
Normal file → Executable file
0
tests/smoke/runtest.sh
Normal file → Executable file
|
|
@ -1,11 +0,0 @@
|
|||
- hosts: localhost
|
||||
roles:
|
||||
- role: standard-test-basic
|
||||
tags:
|
||||
- classic
|
||||
tests:
|
||||
- smoke
|
||||
required_packages:
|
||||
- iproute
|
||||
- corosync-qdevice
|
||||
- corosync-qnetd
|
||||
Loading…
Add table
Add a link
Reference in a new issue