diff --git a/createlinks b/createlinks index e480223..b07ec06 100644 --- a/createlinks +++ b/createlinks @@ -34,6 +34,7 @@ safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/nut- safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/nut-monitor"); safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/nut-server"); templates2events("/etc/systemd/system-preset/49-koozali.preset", $event); +templates2events("/etc/rsyslog.conf", $event); event_link("nut-config", $event, "4"); event_link("nut-config-drivers", $event, "50"); event_link("systemd-default", $event, "88"); diff --git a/root/etc/e-smith/templates/etc/etc/rsyslog.conf/32nut b/root/etc/e-smith/templates/etc/etc/rsyslog.conf/32nut new file mode 100644 index 0000000..d4ba923 --- /dev/null +++ b/root/etc/e-smith/templates/etc/etc/rsyslog.conf/32nut @@ -0,0 +1,5 @@ +#nut / UPS we only use journalctl +:programname, isequal, "nut-monitor" stop +:programname, isequal, "nut-server" stop +:programname, startswith, "nut-driver" stop + diff --git a/smeserver-nutUPS.spec b/smeserver-nutUPS.spec index 2adcfe8..5ec6380 100644 --- a/smeserver-nutUPS.spec +++ b/smeserver-nutUPS.spec @@ -4,7 +4,7 @@ Summary: SME server - nut UPS interaction module %define name smeserver-nutUPS Name: %{name} %define version 11.0.0 -%define release 11 +%define release 12 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -26,6 +26,9 @@ A module which configures the Network UPS Tools suite for operation with the SME server software. %changelog +* Wed May 28 2025 Jean-Philippe Pialasse 11.0.0-12.sme +- fix [SME: ] + * Sat May 24 2025 Jean-Philippe Pialasse 11.0.0-11.sme - fix issue with standalone and netserver mode [SME: 13012]