Fix autotools case for @ and adapt meson.build to handle ExecStop as well

diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am
index 331408fa8f440d0cf199a0157b4d80a26963035d..08b0c3c7598dbb6f24af05ac3336d785d8314d03 100644 (file)
--- a/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@ -697,10 +697,10 @@ pdns-recursor@.service: pdns-recursor.service
        $(AM_V_GEN)sed -e 's!/pdns_recursor!& --config-name=%i!' \
          -e 's!Recursor!& %i!' \
          -e 's!SyslogIdentifier=.*!&-%i!' \
-         -e 's!--socket-dir=%t/pdns-recursor!--socket-dir=%t/pdns-recursor-%i --config-name=%i!' \
          < $< > $@
 if HAVE_SYSTEMD_PERCENT_T
-       $(AM_V_GEN)sed -e 's!RuntimeDirectory=.*!&-%i!' -i $@
+       $(AM_V_GEN)sed -e 's!RuntimeDirectory=.*!&-%i!' \
+         -e 's!--socket-dir=%t/pdns-recursor!--config-name=%i --socket-dir=%t/pdns-recursor-%i!' -i $@
 if !HAVE_SYSTEMD_WITH_RUNTIME_DIR_ENV
        $(AM_V_GEN)sed -e 's!--socket-dir=[^ ]\+!&-%i !' -i $@
 endif

diff --git a/pdns/recursordist/meson.build b/pdns/recursordist/meson.build
index 81d740568fe5535f090ac493c770ea70ccf31b20..16184938e82f5e4d59c23f5bc450a725c17a93cb 100644 (file)
--- a/pdns/recursordist/meson.build
+++ b/pdns/recursordist/meson.build
@@ -661,6 +661,7 @@ if dep_systemd.found()
   rec_service_conf_general.set('Description', 'PowerDNS Recursor')
   rec_service_conf_general.set('ConfigName', '')
   rec_service_conf_general.set('SocketDir', enable_socket_dir ? '--socket-dir=%t/pdns-recursor' : '')
+  rec_service_conf_general.set('RecControlSocketDir', '--socket-dir=%t/pdns-recursor')
   rec_service_conf_general.set('SyslogIdentifier', 'pdns-recursor')
   rec_service_conf_general.set('RuntimeDirectory', 'pdns-recursor')
 
@@ -675,6 +676,7 @@ if dep_systemd.found()
   rec_service_conf_instance.set('Description', 'PowerDNS Recursor %i')
   rec_service_conf_instance.set('ConfigName', '--config-name=%i')
   rec_service_conf_instance.set('SocketDir', enable_socket_dir ? '--socket-dir=%t/pdns-recursor-%i' : '')
+  rec_service_conf_instance.set('RecControlSocketDir', '--socket-dir=%t/pdns-recursor-%i')
   rec_service_conf_instance.set('SyslogIdentifier', 'pdns-recursor-%i')
   rec_service_conf_instance.set('RuntimeDirectory', have_systemd_percent_t ? 'pdns-recursor-%i' : 'pdns-recursor')
 

diff --git a/pdns/recursordist/pdns-recursor.service.meson.in b/pdns/recursordist/pdns-recursor.service.meson.in
index 2150a8cdddc27ce056071352a577cceab93c5a87..63dc8dd2d8d2d4ea7560c7e317b579d39588a609 100644 (file)
--- a/pdns/recursordist/pdns-recursor.service.meson.in
+++ b/pdns/recursordist/pdns-recursor.service.meson.in
@@ -8,6 +8,7 @@ After=network-online.target time-sync.target
 
 [Service]
 ExecStart=@StaticBinDir@/pdns_recursor @ConfigName@ @SocketDir@ --daemon=no --write-pid=no --disable-syslog --log-timestamp=no
+ExecStop=@BinDir@/rec_control @ConfigName@ @RecControlSocketDir@ quit-nicely
 User=@ServiceUser@
 Group=@ServiceGroup@
 Type=notify