diff --git a/.gitignore b/.gitignore index 4c80317..8794c75 100755 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /v0.10.3.tar.gz /v0.11.tar.gz /v0.12.0.tar.gz +/v0.13.1.tar.gz diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..0a9cfb3 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,19 @@ +specfile_path: greenboot.spec +synced_files: + - greenboot.spec + - .packit.yaml +upstream_package_name: greenboot +upstream_tag_template: v{version} +downstream_package_name: greenboot +jobs: + - job: sync_from_downstream + trigger: commit + - job: propose_downstream + trigger: release + metadata: + dist-git-branch: fedora-all + - job: tests + trigger: pull_request + metadata: + targets: + - fedora-all diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..8e8a2fa --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 0.40.1.dev14+g9731ef0. diff --git a/greenboot.spec b/greenboot.spec index 1ee9938..e6b9d18 100644 --- a/greenboot.spec +++ b/greenboot.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} Name: greenboot -Version: 0.12.0 +Version: 0.13.1 Release: 1%{?dist} Summary: Generic Health Check Framework for systemd License: LGPLv2+ @@ -17,59 +17,32 @@ ExcludeArch: s390x BuildRequires: systemd-rpm-macros %{?systemd_requires} Requires: systemd >= 240 +Requires: grub2-tools-minimal +Requires: rpm-ostree +# PAM is required to programatically read motd messages from /etc/motd.d/* +# This causes issues with RHEL-8 as the fix isn't there an el8 is on pam-1.3.x +Requires: pam >= 1.4.0 +# While not strictly necessary to generate the motd, the main use-case of this package is to display it on SSH login +Recommends: openssh +Provides: greenboot-auto-update-fallback +Obsoletes: greenboot-auto-update-fallback <= 0.12.0 +Provides: greenboot-grub2 +Obsoletes: greenboot-grub2 <= 0.12.0 +Provides: greenboot-reboot +Obsoletes: greenboot-reboot <= 0.12.0 +Provides: greenboot-rpm-ostree-grub2 +Obsoletes: greenboot-rpm-ostree-grub2 <= 0.12.0 %description %{summary}. -%package auto-update-fallback -Summary: Automatic updates and failure fallback for rpm-ostree-based system -Requires: %{name} = %{version}-%{release} -Requires: %{name}-reboot = %{version}-%{release} -Requires: %{name}-rpm-ostree-grub2 = %{version}-%{release} - -%description auto-update-fallback -%{summary}. - -%package status -Summary: Message of the Day updater for greenboot -Requires: %{name} = %{version}-%{release} -# PAM is required to programatically read motd messages from /etc/motd.d/* -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 - -%description status -%{summary}. - -%package rpm-ostree-grub2 -Summary: Scripts for greenboot on rpm-ostree-based systems using the Grub2 bootloader -Requires: %{name} = %{version}-%{release} -Requires: %{name}-grub2 = %{version}-%{release} -Requires: rpm-ostree - -%description rpm-ostree-grub2 -%{summary}. - -%package grub2 -Summary: Grub2 specific scripts for greenboot -Requires: %{name} = %{version}-%{release} -Requires: grub2-tools-minimal - -%description grub2 -%{summary}. - -%package reboot -Summary: Reboot on red status for greenboot -Requires: %{name} = %{version}-%{release} - -%description reboot -%{summary}. - -%package update-platforms-check +%package default-health-checks Summary: Update platforms DNS resolution and connection check for greenboot Requires: %{name} = %{version}-%{release} +Provides: greenboot-update-platforms-check +Obsoletes: greenboot-update-platforms-check <= 0.12.0 -%description update-platforms-check +%description default-health-checks %{summary}. %prep @@ -84,6 +57,10 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/check/required.d mkdir %{buildroot}%{_sysconfdir}/%{name}/check/wanted.d mkdir %{buildroot}%{_sysconfdir}/%{name}/green.d mkdir %{buildroot}%{_sysconfdir}/%{name}/red.d +mkdir -p %{buildroot}%{_prefix}/lib/%{name}/check/required.d +mkdir %{buildroot}%{_prefix}/lib/%{name}/check/wanted.d +mkdir %{buildroot}%{_prefix}/lib/%{name}/green.d +mkdir %{buildroot}%{_prefix}/lib/%{name}/red.d mkdir -p %{buildroot}%{_unitdir} mkdir -p %{buildroot}%{_unitdir}/greenboot-healthcheck.service.d mkdir -p %{buildroot}%{_tmpfilesdir} @@ -93,8 +70,8 @@ install -DpZm 0644 usr/lib/systemd/system/greenboot-healthcheck.service.d/10-net 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 +install -DpZm 0755 usr/lib/greenboot/check/required.d/* %{buildroot}%{_prefix}/lib/%{name}/check/required.d +install -DpZm 0755 usr/lib/greenboot/check/wanted.d/* %{buildroot}%{_prefix}/lib/%{name}/check/wanted.d %post %systemd_post greenboot-healthcheck.service @@ -102,21 +79,13 @@ install -DpZm 0755 etc/greenboot/check/wanted.d/* %{buildroot}%{_sysconfdir}/%{n %systemd_post greenboot-task-runner.service %systemd_post redboot-task-runner.service %systemd_post redboot.target - -%post grub2 +%systemd_post greenboot-status.service %systemd_post greenboot-grub2-set-counter.service %systemd_post greenboot-grub2-set-success.service - -%post reboot +%systemd_post greenboot-rpm-ostree-grub2-check-fallback.service %systemd_post redboot-auto-reboot.service -%post rpm-ostree-grub2 -%systemd_post greenboot-rpm-ostree-grub2-check-fallback.service - -%post status -%systemd_post greenboot-status.service - -%post update-platforms-check +%post default-health-checks %systemd_post greenboot-loading-message.service %preun @@ -125,18 +94,12 @@ install -DpZm 0755 etc/greenboot/check/wanted.d/* %{buildroot}%{_sysconfdir}/%{n %systemd_preun greenboot-task-runner.service %systemd_preun redboot-task-runner.service %systemd_preun redboot.target - -%preun grub2 +%systemd_preun greenboot-status.service %systemd_preun greenboot-grub2-set-counter.service %systemd_preun greenboot-grub2-set-success.service - -%preun rpm-ostree-grub2 %systemd_preun greenboot-rpm-ostree-grub2-check-fallback.service -%preun status -%systemd_preun greenboot-status.service - -%preun update-platforms-check +%preun default-health-checks %systemd_preun greenboot-loading-message.service %postun @@ -145,18 +108,12 @@ install -DpZm 0755 etc/greenboot/check/wanted.d/* %{buildroot}%{_sysconfdir}/%{n %systemd_postun greenboot-task-runner.service %systemd_postun redboot-task-runner.service %systemd_postun redboot.target - -%postun grub2 +%systemd_postun greenboot-status.service %systemd_postun greenboot-grub2-set-counter.service %systemd_postun greenboot-grub2-set-success.service - -%postun rpm-ostree-grub2 %systemd_postun greenboot-rpm-ostree-grub2-check-fallback.service -%postun status -%systemd_postun greenboot-status.service - -%postun update-platforms-check +%postun default-health-checks %systemd_postun greenboot-loading-message.service %files @@ -170,40 +127,41 @@ install -DpZm 0755 etc/greenboot/check/wanted.d/* %{buildroot}%{_sysconfdir}/%{n %{_unitdir}/greenboot-task-runner.service %{_unitdir}/redboot-task-runner.service %{_unitdir}/redboot.target +%dir %{_prefix}/lib/%{name} +%dir %{_prefix}/lib/%{name}/check +%dir %{_prefix}/lib/%{name}/check/required.d +%{_prefix}/lib/%{name}/check/required.d/00_required_scripts_start.sh +%dir %{_prefix}/lib/%{name}/check/wanted.d +%{_prefix}/lib/%{name}/check/wanted.d/00_wanted_scripts_start.sh +%dir %{_prefix}/lib/%{name}/green.d +%dir %{_prefix}/lib/%{name}/red.d %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/check %dir %{_sysconfdir}/%{name}/check/required.d -%{_sysconfdir}/%{name}/check/required.d/00_required_scripts_start.sh %dir %{_sysconfdir}/%{name}/check/wanted.d -%{_sysconfdir}/%{name}/check/wanted.d/00_wanted_scripts_start.sh %dir %{_sysconfdir}/%{name}/green.d %dir %{_sysconfdir}/%{name}/red.d - -%files status %{_exec_prefix}/lib/motd.d/boot-status %{_libexecdir}/%{name}/greenboot-status %{_tmpfilesdir}/greenboot-status-motd.conf %{_unitdir}/greenboot-status.service - -%files rpm-ostree-grub2 -%{_libexecdir}/%{name}/greenboot-rpm-ostree-grub2-check-fallback -%{_unitdir}/greenboot-rpm-ostree-grub2-check-fallback.service - -%files grub2 %{_libexecdir}/%{name}/greenboot-grub2-set-counter %{_unitdir}/greenboot-grub2-set-success.service %{_unitdir}/greenboot-grub2-set-counter.service - -%files reboot +%{_libexecdir}/%{name}/greenboot-rpm-ostree-grub2-check-fallback +%{_unitdir}/greenboot-rpm-ostree-grub2-check-fallback.service %{_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 +%files default-health-checks +%{_prefix}/lib/%{name}/check/required.d/01_repository_dns_check.sh +%{_prefix}/lib/%{name}/check/wanted.d/01_update_platforms_check.sh %{_unitdir}/greenboot-healthcheck.service.d/10-network-online.conf %changelog +* Wed Nov 10 2021 Packit Service - 0.13.1-1 +- tag 0.31.1 (Peter Robinson) + * 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. diff --git a/sources b/sources index 2f99d05..92baabb 100755 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v0.12.0.tar.gz) = 98342145e452345429dbf701be980497f961e7182e72661d14481532d2b0d6db04aeab928839609649b942f1ba4c940ba823249239eb8735cfd8200cfe62709b +SHA512 (v0.13.1.tar.gz) = e6f8fc5bbfea28409937734f2b5effd50077e6a90d994bd2d7afa16d48461b1e9a26045466ad599dbf053fa6727e296268474c56a44a4637a7723d18c2572068