From cae42021437a2d583780e8f1d4cc5abcb863f588 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Pialasse Date: Tue, 2 Apr 2024 23:46:01 -0400 Subject: [PATCH] * Tue Apr 02 2024 Jean-Philippe Pialasse 11.0.0-4.sme - revert path for tinydns-data and tinydns [SME: 12566] - change update event name --- createlinks | 8 ++++---- root/var/service/tinydns/control/1 | 2 +- root/var/service/tinydns/run | 2 +- smeserver-tinydns.spec | 6 +++++- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/createlinks b/createlinks index e421081..bbfab15 100644 --- a/createlinks +++ b/createlinks @@ -5,7 +5,7 @@ use strict; use esmith::Build::CreateLinks qw(:all); #------------------------------------------------------------------- -# actions for bootstrap-console-save event, e-smith-tinydns-update : +# actions for bootstrap-console-save event, smeserver-tinydns-update : #------------------------------------------------------------------- foreach (qw( env/IP @@ -15,7 +15,7 @@ foreach (qw( { templates2events("/var/service/tinydns/$_", qw( bootstrap-console-save - e-smith-tinydns-update + smeserver-tinydns-update )); } @@ -26,9 +26,9 @@ my $event = "ip-change"; safe_symlink("sigusr2", "root/etc/e-smith/events/$event/services2adjust/tinydns"); #-------------------------------------------------- -# actions for e-smith-tinydns-update event +# actions for smeserver-tinydns-update event #-------------------------------------------------- -$event = "e-smith-tinydns-update"; +$event = "smeserver-tinydns-update"; safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/tinydns"); templates2events("/etc/systemd/system-preset/49-koozali.preset", $event); event_link("systemd-reload", $event, "89"); diff --git a/root/var/service/tinydns/control/1 b/root/var/service/tinydns/control/1 index 0917311..8eaaf47 100644 --- a/root/var/service/tinydns/control/1 +++ b/root/var/service/tinydns/control/1 @@ -1,4 +1,4 @@ #! /bin/sh /sbin/e-smith/expand-template /var/service/tinydns/root/data -cd "/var/service/tinydns/root" && /usr/bin/tinydns-data +cd "/var/service/tinydns/root" && /usr/local/bin/tinydns-data diff --git a/root/var/service/tinydns/run b/root/var/service/tinydns/run index deb6bf1..0a8c41d 100644 --- a/root/var/service/tinydns/run +++ b/root/var/service/tinydns/run @@ -4,5 +4,5 @@ exec 2>&1 exec envdir ./env sh -c ' exec envuidgid dns \ softlimit -d "$DATALIMIT" \ - /usr/bin/tinydns + /usr/local/bin/tinydns ' diff --git a/smeserver-tinydns.spec b/smeserver-tinydns.spec index 8a11adc..845fcbb 100644 --- a/smeserver-tinydns.spec +++ b/smeserver-tinydns.spec @@ -4,7 +4,7 @@ Summary: smeserver module to configure tinydns %define name smeserver-tinydns Name: %{name} %define version 11.0.0 -%define release 3 +%define release 4 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -24,6 +24,10 @@ Provides: e-smith-tinydns AutoReqProv: no %changelog +* Tue Apr 02 2024 Jean-Philippe Pialasse 11.0.0-4.sme +- revert path for tinydns-data and tinydns [SME: 12566] +- change update event name + * Sat Mar 30 2024 Trevor Batley 11.0.0-3.sme - change directory for *uidgid and multilog to /usr/bin [SME: 12566]