meson: systemd - install drop-in examples

diff --git a/etc/config/meson.build b/etc/config/meson.build
index 27128bc92792cb557b248465434341fd68e3ef3e..0824fd15de4f7f5b91789dfff1bdf0042d396838 100644 (file)
--- a/etc/config/meson.build
+++ b/etc/config/meson.build
@@ -36,8 +36,6 @@ conf_config = configuration_data()
 conf_config.set('config_defaults', config_defaults)
 conf_config.set('config_managed_ta', config_managed_ta)
 
-examples_dir = join_paths(doc_dir, 'examples')
-
 foreach config_filename : example_configs
   configure_file(
     input: config_filename + '.in',

diff --git a/meson.build b/meson.build
index 35a1ff5facc13feca685fc47ec564bb8d17e60ce..63dfb36ab41fa95a5038b74b63f0520241c63a48 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -34,6 +34,7 @@ libkres_soversion = 9
 prefix = get_option('prefix')
 data_dir = join_paths(prefix, get_option('datadir'), 'knot-resolver')
 doc_dir = join_paths(prefix, get_option('datadir'), 'doc', 'knot-resolver')
+examples_dir = join_paths(doc_dir, 'examples')
 etc_dir = join_paths(prefix, get_option('sysconfdir'), 'knot-resolver')
 sbin_dir = join_paths(prefix, get_option('sbindir'))
 systemd_cache_dir = ''

diff --git a/systemd/kresd-tls.socket.d/all-interfaces.conf b/systemd/kresd-tls.socket.d/all-interfaces.conf
new file mode 100644 (file)
index 0000000..7607f26
--- /dev/null
+++ b/systemd/kresd-tls.socket.d/all-interfaces.conf
@@ -0,0 +1,11 @@
+# /etc/systemd/system/kresd-tls.socket.d/override.conf
+
+# Configure kresd-tls.socket to listen on all IPv4 and IPv6 interfaces.
+
+# Empty ListenStream= directive is required to avoid port clash with default
+# localhost. If you've disabled IPv6 support in kernel, use 0.0.0.0 instead of
+# [::]
+
+[Socket]
+ListenStream=
+ListenStream=[::]:853

diff --git a/systemd/kresd-tls.socket.d/specific-interfaces.conf b/systemd/kresd-tls.socket.d/specific-interfaces.conf
new file mode 100644 (file)
index 0000000..ca3d21e
--- /dev/null
+++ b/systemd/kresd-tls.socket.d/specific-interfaces.conf
@@ -0,0 +1,9 @@
+# /etc/systemd/system/kresd-tls.socket.d/override.conf
+
+# Configure which interfaces should kresd-tls.socket listen on.
+
+# ListenStream can be added multiple times.
+
+[Socket]
+ListenStream=192.0.2.115:853
+ListenStream=[2001:db8::115]:853

diff --git a/systemd/kresd.socket.d/all-interfaces.conf b/systemd/kresd.socket.d/all-interfaces.conf
new file mode 100644 (file)
index 0000000..c077d9e
--- /dev/null
+++ b/systemd/kresd.socket.d/all-interfaces.conf
@@ -0,0 +1,13 @@
+# /etc/systemd/system/kresd.socket.d/override.conf
+
+# Configure kresd.socket to listen on all IPv4 and IPv6 interfaces.
+
+# Empty ListenDatagram= and ListenStream= directives are required to avoid port
+# clash with default localhost. If you've disabled IPv6 support in kernel, use
+# 0.0.0.0 instead of [::]
+
+[Socket]
+ListenDatagram=
+ListenStream=
+ListenDatagram=[::]:53
+ListenStream=[::]:53

diff --git a/systemd/kresd.socket.d/specific-interfaces.conf b/systemd/kresd.socket.d/specific-interfaces.conf
new file mode 100644 (file)
index 0000000..24e7ae9
--- /dev/null
+++ b/systemd/kresd.socket.d/specific-interfaces.conf
@@ -0,0 +1,11 @@
+# /etc/systemd/system/kresd.socket.d/override.conf
+
+# Configure specific interfaces should kresd.socket listen on.
+
+# ListenDatagram and ListenStream can be added multiple times.
+
+[Socket]
+ListenDatagram=192.0.2.115:53
+ListenStream=192.0.2.115:53
+ListenDatagram=[2001:db8::115]:53
+ListenStream=[2001:db8::115]:53

diff --git a/systemd/meson.build b/systemd/meson.build
index 8543db4a9413f54e527dfc132a5cfebc01338a4f..d34e0dc3e7d5f5cf64a63c1f1cf1dc8b00492ea8 100644 (file)
--- a/systemd/meson.build
+++ b/systemd/meson.build
@@ -58,7 +58,21 @@ if systemd_socket
     install_dir: systemd_tmpfiles_dir,
   )
 
-  # TODO example drop-ins
+  ## example drop-ins
+  install_data(
+    sources: [
+      'kresd.socket.d/all-interfaces.conf',
+      'kresd.socket.d/specific-interfaces.conf',
+    ],
+    install_dir: join_paths(examples_dir, 'kresd.socket.d'),
+  )
+  install_data(
+    sources: [
+      'kresd-tls.socket.d/all-interfaces.conf',
+      'kresd-tls.socket.d/specific-interfaces.conf',
+    ],
+    install_dir: join_paths(examples_dir, 'kresd-tls.socket.d'),
+  )
 else
   subdir('nosocket')
 endif