From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Mon, 11 Feb 2019 11:37:31 +0000 (+0100)
Subject: meson: systemd - rename cache dir to work dir
X-Git-Tag: v4.0.0~24^2~154
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=511e3c6ce6af982adb736076efd9c69971c2b35d;p=thirdparty%2Fknot-resolver.git

meson: systemd - rename cache dir to work dir
---

diff --git a/meson.build b/meson.build
index 63dfb36ab..1ce3c3c1b 100644
--- a/meson.build
+++ b/meson.build
@@ -37,7 +37,7 @@ 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 = ''
+systemd_work_dir = ''
 run_dir = ''
 systemd_unit_dir = ''
 systemd_tmpfiles_dir = ''
@@ -191,7 +191,7 @@ message('''
   systemd:              @0@'''.format(summary_systemd) + '''
     socket activation:  @0@'''.format(summary_systemd_socket) + '''
     user mode:          @0@'''.format(summary_systemd_user_mode) + '''
-    cache_dir:          @0@'''.format(systemd_cache_dir) + '''
+    work_dir:           @0@'''.format(systemd_work_dir) + '''
     run_dir:            @0@'''.format(run_dir) + '''
 
   components
diff --git a/systemd/kresd@.service.in b/systemd/kresd@.service.in
index c559a611f..bc584a30b 100644
--- a/systemd/kresd@.service.in
+++ b/systemd/kresd@.service.in
@@ -5,7 +5,7 @@ Documentation=man:kresd(8)
 
 [Service]
 Type=notify
-WorkingDirectory=@systemd_cache_dir@
+WorkingDirectory=@systemd_work_dir@
 ExecStart=@sbin_dir@/kresd --config=@etc_dir@/kresd.conf
 User=@user@
 Restart=on-failure
diff --git a/systemd/meson.build b/systemd/meson.build
index d34e0dc3e..205e604fb 100644
--- a/systemd/meson.build
+++ b/systemd/meson.build
@@ -1,8 +1,8 @@
 # systemd
 
 ## paths
-# TODO user mode
-systemd_cache_dir = join_paths(
+# TODO user mode; prefix==/usr/local
+systemd_work_dir = join_paths(
   prefix, get_option('localstatedir'), 'cache', 'knot-resolver')
 run_dir = join_paths('/run', 'knot-resolver')
 systemd_unit_dir = join_paths(prefix, get_option('libdir'), 'systemd', 'system')
@@ -12,7 +12,7 @@ systemd_tmpfiles_dir = join_paths(prefix, get_option('libdir'), 'tmpfiles.d')
 systemd_config = configuration_data()
 systemd_config.set('user', user)
 systemd_config.set('group', group)
-systemd_config.set('systemd_cache_dir', systemd_cache_dir)
+systemd_config.set('systemd_work_dir', systemd_work_dir)
 systemd_config.set('sbin_dir', sbin_dir)
 systemd_config.set('etc_dir', etc_dir)
 systemd_config.set('run_dir', run_dir)
diff --git a/systemd/nosocket/kresd@.service.in b/systemd/nosocket/kresd@.service.in
index b4b57190a..abe4d2f2c 100644
--- a/systemd/nosocket/kresd@.service.in
+++ b/systemd/nosocket/kresd@.service.in
@@ -5,7 +5,7 @@ Documentation=man:kresd(8)
 
 [Service]
 Type=simple
-WorkingDirectory=@systemd_cache_dir@
+WorkingDirectory=@systemd_work_dir@
 ExecStart=@sbin_dir@/kresd --config=@etc_dir@/kresd.conf --forks=1
 Restart=on-failure
 
diff --git a/systemd/nosocket/tmpfiles.d/knot-resolver.conf.in b/systemd/nosocket/tmpfiles.d/knot-resolver.conf.in
index f3a968673..e984a3cb2 100644
--- a/systemd/nosocket/tmpfiles.d/knot-resolver.conf.in
+++ b/systemd/nosocket/tmpfiles.d/knot-resolver.conf.in
@@ -1,3 +1,3 @@
 # tmpfiles.d(5) runtime directory for knot-resolver (kresd)
 #Type Path                            Mode UID           GID          Age Argument
-    d @systemd_cache_dir@             0750 @user@        @group@      -   -
+    d @systemd_work_dir@              0750 @user@        @group@      -   -
diff --git a/systemd/tmpfiles.d/knot-resolver.conf.in b/systemd/tmpfiles.d/knot-resolver.conf.in
index 75237f599..ad58939fe 100644
--- a/systemd/tmpfiles.d/knot-resolver.conf.in
+++ b/systemd/tmpfiles.d/knot-resolver.conf.in
@@ -1,4 +1,4 @@
 # tmpfiles.d(5) directories for knot-resolver (kresd)
 #Type Path                            Mode UID           GID          Age Argument
     d @run_dir@                       0750 root          root          -   -
-    d @systemd_cache_dir@             0750 @user@        @group@       -   -
+    d @systemd_work_dir@              0750 @user@        @group@       -   -