- Fix #1265: contrib/unbound.service contains hardcoded path.

git-svn-id: file:///svn/unbound/trunk@4171 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/contrib/unbound.service.in b/contrib/unbound.service.in
index 3ddadfa95ee2b2e37dd7452bea470a0491c92add..6008c1fce3ae7b9256963608a4973f88cad0b2bd 100644 (file)
--- a/contrib/unbound.service.in
+++ b/contrib/unbound.service.in
@@ -6,8 +6,8 @@ Documentation=man:unbound(8)
 WantedBy=multi-user.target
 
 [Service]
-ExecReload=/bin/kill -HUP $MAINPID
-ExecStart=/home/vagrant/unbound_systemd/unbound
+ExecReload=@bindir@/kill -HUP $MAINPID
+ExecStart=@sbindir@/unbound
 NotifyAccess=main
 Type=notify
 CapabilityBoundingSet=CAP_IPC_LOCK CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID CAP_SYS_CHROOT
@@ -20,7 +20,7 @@ ProtectControlGroups=true
 ProtectKernelModules=true
 ProtectKernelTunables=true
 ProtectSystem=strict
-ReadWritePaths=/etc/unbound /run
+ReadWritePaths=@sysconfdir@ @localstatedir@ /run
 RestrictAddressFamilies=AF_INET AF_UNIX
 RestrictRealtime=true
 SystemCallArchitectures=native

diff --git a/doc/Changelog b/doc/Changelog
index 7899cdeefc5b84182861be7ecc358aec1754d284..acf73e0b86dede69186c862cc3a2fb4ef0508d63 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,4 +1,7 @@
-16 May 2017: George
+17 May 2017: Wouter
+       - Fix #1265: contrib/unbound.service contains hardcoded path.
+
+17 May 2017: George
        - Use qstate's region for IPSECKEY rrset (ipsecmod).
 
 16 May 2017: George