diff --git a/.gitignore b/.gitignore index 21eee71..4c80317 100755 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /v0.10.2.tar.gz /v0.10.3.tar.gz /v0.11.tar.gz +/v0.12.0.tar.gz diff --git a/greenboot.spec b/greenboot.spec index 5247a76..1ee9938 100644 --- a/greenboot.spec +++ b/greenboot.spec @@ -1,8 +1,8 @@ %global debug_package %{nil} Name: greenboot -Version: 0.11 -Release: 4%{?dist} +Version: 0.12.0 +Release: 1%{?dist} Summary: Generic Health Check Framework for systemd License: LGPLv2+ @@ -16,7 +16,7 @@ Source0: https://github.com/%{repo_owner}/%{repo_name}/archive/%{repo ExcludeArch: s390x BuildRequires: systemd-rpm-macros %{?systemd_requires} -Requires: systemd +Requires: systemd >= 240 %description %{summary}. @@ -34,8 +34,7 @@ Requires: %{name}-rpm-ostree-grub2 = %{version}-%{release} Summary: Message of the Day updater for greenboot Requires: %{name} = %{version}-%{release} # PAM is required to programatically read motd messages from /etc/motd.d/* -# This needs an explicit version but we're awaiting the glacial fix for rhbz 1856828 bug -Requires: pam +Requires: pam >= 1.3.1-15 # While not strictly necessary to generate the motd, the main use-case of this package is to display it on SSH login Recommends: openssh @@ -66,6 +65,13 @@ Requires: %{name} = %{version}-%{release} %description reboot %{summary}. +%package update-platforms-check +Summary: Update platforms DNS resolution and connection check for greenboot +Requires: %{name} = %{version}-%{release} + +%description update-platforms-check +%{summary}. + %prep %setup -q @@ -79,16 +85,20 @@ mkdir %{buildroot}%{_sysconfdir}/%{name}/check/wanted.d mkdir %{buildroot}%{_sysconfdir}/%{name}/green.d mkdir %{buildroot}%{_sysconfdir}/%{name}/red.d mkdir -p %{buildroot}%{_unitdir} +mkdir -p %{buildroot}%{_unitdir}/greenboot-healthcheck.service.d mkdir -p %{buildroot}%{_tmpfilesdir} install -DpZm 0755 usr/libexec/greenboot/* %{buildroot}%{_libexecdir}/%{name} install -DpZm 0644 usr/lib/motd.d/boot-status %{buildroot}%{_exec_prefix}/lib/motd.d/boot-status -install -DpZm 0644 usr/lib/systemd/system/* %{buildroot}%{_unitdir} +install -DpZm 0644 usr/lib/systemd/system/greenboot-healthcheck.service.d/10-network-online.conf %{buildroot}%{_unitdir}/greenboot-healthcheck.service.d/10-network-online.conf +install -DpZm 0644 usr/lib/systemd/system/*.target %{buildroot}%{_unitdir} +install -DpZm 0644 usr/lib/systemd/system/*.service %{buildroot}%{_unitdir} install -DpZm 0644 usr/lib/tmpfiles.d/greenboot-status-motd.conf %{buildroot}%{_tmpfilesdir}/greenboot-status-motd.conf install -DpZm 0755 etc/greenboot/check/required.d/* %{buildroot}%{_sysconfdir}/%{name}/check/required.d install -DpZm 0755 etc/greenboot/check/wanted.d/* %{buildroot}%{_sysconfdir}/%{name}/check/wanted.d %post %systemd_post greenboot-healthcheck.service +%systemd_post greenboot-loading-message.service %systemd_post greenboot-task-runner.service %systemd_post redboot-task-runner.service %systemd_post redboot.target @@ -106,8 +116,12 @@ install -DpZm 0755 etc/greenboot/check/wanted.d/* %{buildroot}%{_sysconfdir}/%{n %post status %systemd_post greenboot-status.service +%post update-platforms-check +%systemd_post greenboot-loading-message.service + %preun %systemd_preun greenboot-healthcheck.service +%systemd_preun greenboot-loading-message.service %systemd_preun greenboot-task-runner.service %systemd_preun redboot-task-runner.service %systemd_preun redboot.target @@ -122,8 +136,12 @@ install -DpZm 0755 etc/greenboot/check/wanted.d/* %{buildroot}%{_sysconfdir}/%{n %preun status %systemd_preun greenboot-status.service +%preun update-platforms-check +%systemd_preun greenboot-loading-message.service + %postun %systemd_postun greenboot-healthcheck.service +%systemd_postun greenboot-loading-message.service %systemd_postun greenboot-task-runner.service %systemd_postun redboot-task-runner.service %systemd_postun redboot.target @@ -138,12 +156,17 @@ install -DpZm 0755 etc/greenboot/check/wanted.d/* %{buildroot}%{_sysconfdir}/%{n %postun status %systemd_postun greenboot-status.service +%postun update-platforms-check +%systemd_postun greenboot-loading-message.service + %files %doc README.md %license LICENSE %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/%{name} +%{_libexecdir}/%{name}/greenboot-loading-message %{_unitdir}/greenboot-healthcheck.service +%{_unitdir}/greenboot-loading-message.service %{_unitdir}/greenboot-task-runner.service %{_unitdir}/redboot-task-runner.service %{_unitdir}/redboot.target @@ -175,24 +198,28 @@ install -DpZm 0755 etc/greenboot/check/wanted.d/* %{buildroot}%{_sysconfdir}/%{n %{_libexecdir}/%{name}/redboot-auto-reboot %{_unitdir}/redboot-auto-reboot.service +%files update-platforms-check +%{_sysconfdir}/%{name}/check/required.d/01_repository_dns_check.sh +%{_sysconfdir}/%{name}/check/wanted.d/01_update_platforms_check.sh +%{_unitdir}/greenboot-healthcheck.service.d/10-network-online.conf + %changelog -* Thu Jul 22 2021 Fedora Release Engineering - 0.11-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild +* Mon Jul 26 2021 Jose Noguera - 0.12.0-1 +- Update to 0.12.0 +- Add ability to configure maximum number of boot attempts via env var and config file. +- Add How does it work section to README. +- Add CI via GitHub Actions and unit testing with BATS. +- Add update platforms DNS resolutiona and connection checker as health checks out of the box -* Tue Jan 26 2021 Fedora Release Engineering - 0.11-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Sat Jan 16 2021 Peter Robinson - 0.11-2 +* Sat Jan 16 2021 Peter Robinson - 0.11.0-2 - Make arch specific due to grub availability on s390x - Resolves: rhbz#1915241 -* Thu Aug 13 2020 Christian Glombek - 0.11-1 +* Thu Aug 13 2020 Christian Glombek - 0.11.0-1 - Update to 0.11.0 -- Resolves: rhbz#1815140 * Thu Jun 11 2020 Peter Robinson - 0.10.3-2 - Update changelog -- Resolves: rhbz#1815140 * Fri Jun 05 2020 Christian Glombek - 0.10.3-1 - Update to 0.10.3 diff --git a/sources b/sources index 861adf3..2f99d05 100755 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v0.11.tar.gz) = 6145e48294f82ee7e02930277272700087dbb974aaed34f439b3a944e0e02e4bba3bc3325c50cae1c0c059d57793b5d75c4c5de2b0a8598ed990706ecc0c0900 +SHA512 (v0.12.0.tar.gz) = 98342145e452345429dbf701be980497f961e7182e72661d14481532d2b0d6db04aeab928839609649b942f1ba4c940ba823249239eb8735cfd8200cfe62709b