implement some suggestions (#1236363)

Signed-off-by: Tomas Hozza <thozza@redhat.com>
This commit is contained in:
Tomas Hozza 2015-07-15 10:04:29 +02:00
commit 50c7e56ea0
3 changed files with 57 additions and 1 deletions

View file

@ -0,0 +1,25 @@
From b5a24c7985afa8ce7d0e2f3b80a4c72de69fea75 Mon Sep 17 00:00:00 2001
From: Tomas Hozza <thozza@redhat.com>
Date: Tue, 14 Jul 2015 13:15:22 +0200
Subject: [PATCH 2/2] Remove restorecon call in dnssec-triggerd-keygen.service
Any SELinux issues should be fixed in the policy
Signed-off-by: Tomas Hozza <thozza@redhat.com>
---
dnssec-triggerd-keygen.service | 1 -
1 file changed, 1 deletion(-)
diff --git a/dnssec-triggerd-keygen.service b/dnssec-triggerd-keygen.service
index 8fcd4f3..e3b8b10 100644
--- a/dnssec-triggerd-keygen.service
+++ b/dnssec-triggerd-keygen.service
@@ -5,5 +5,4 @@ ConditionPathExists=!/etc/dnssec-trigger/dnssec_trigger_control.key
[Service]
Type=oneshot
ExecStart=/usr/sbin/dnssec-trigger-control-setup -d /etc/dnssec-trigger/
-ExecStart=-/sbin/restorecon /etc/dnssec-trigger/*
RemainAfterExit=yes
--
2.4.3

View file

@ -0,0 +1,25 @@
From a60ba46da9a4271247fd23439438866913644269 Mon Sep 17 00:00:00 2001
From: Tomas Hozza <thozza@redhat.com>
Date: Tue, 14 Jul 2015 13:09:57 +0200
Subject: [PATCH 1/2] Set PIDFile in the dnssec-triggerd.service file
Signed-off-by: Tomas Hozza <thozza@redhat.com>
---
dnssec-triggerd.service.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/dnssec-triggerd.service.in b/dnssec-triggerd.service.in
index e5f15e8..618a583 100644
--- a/dnssec-triggerd.service.in
+++ b/dnssec-triggerd.service.in
@@ -5,6 +5,7 @@ Requires=unbound.service
Wants=dnssec-triggerd-keygen.service
[Service]
+PIDFile=@pidfile@
Type=simple
Restart=always
ExecStart=@sbindir@/dnssec-triggerd -d
--
2.4.3

View file

@ -18,6 +18,8 @@ Source1: dnssec-trigger.conf
Source2: dnssec-trigger.tmpfiles.d
# Patches
Patch0: dnssec-trigger-0.13-Set-PidFile-in-the-dnssec-triggerd.service-file.patch
Patch1: dnssec-trigger-0.13-Remove-restorecon-call-in-dnssec-triggerd-keygen.ser.patch
Requires(postun): initscripts
Requires: ldns >= 1.6.10, NetworkManager-glib, unbound, xdg-utils
@ -52,6 +54,9 @@ dnssec-trigger-applet the option to go with insecure DNS only.
%prep
%setup -q %{?svn_snapshot:-n %{name}-%{version}_%{svn_snapshot}}
%patch0 -p1
%patch1 -p1
# Fixup the name to not include "panel" in the menu item or name
sed -i "s/ Panel//" panel/dnssec-trigger-panel.desktop.in
sed -i "s/-panel//" panel/dnssec-trigger-panel.desktop.in
@ -135,7 +140,8 @@ fi
%systemd_postun_with_restart %{name}d.service
%changelog
* Tue Jul 14 2015 Tomas Hozza <thozza@redhat.com> - 0.13-0.1.20150714svn
* Wed Jul 15 2015 Tomas Hozza <thozza@redhat.com> - 0.13-0.1.20150714svn
- implement some suggestions (#1236363)
- rebase to the latest svn trunk snapshot 0.13_20150714
- Script is not searching local user directories any more (#1213062)
- Script now doesn't restart NM if version is >= 1.0.3, but sends just signal