Use an onak subdir for the keyd socket

Instead of putting keyd.sock file directly in /run create a /run/onak
which can then be owned by the onak user. Otherwise keyd will have
problems creating the socket when activated directly instead of via the
socket unit file.

diff --git a/debian/onak.service b/debian/onak.service
index 8763784e6bb3b85c15745c913f489e08482d374c..c3ad674db8019cc6f99c14d20ac92850d4f5cd2c 100644 (file)
--- a/debian/onak.service
+++ b/debian/onak.service
@@ -4,6 +4,8 @@ Documentation=man:keyd
 
 [Service]
 User=onak
+ExecStartPre=/bin/mkdir -m 0755 /run/onak
+ExecStartPre=/bin/chown onak /run/onak
 ExecStart=/usr/sbin/keyd -f
 ExecStop=/usr/bin/keydctl quit
 

diff --git a/debian/onak.socket b/debian/onak.socket
index b62d283525ca0cfedf67e1acc7ee92daf8e14b85..a6af88ff7db9bd8bb7d235703de4446804884ea6 100644 (file)
--- a/debian/onak.socket
+++ b/debian/onak.socket
@@ -1,5 +1,5 @@
 [Socket]
-ListenStream=/run/keyd.sock
+ListenStream=/run/onak/keyd.sock
 SocketUser=onak
 SocketMode=0660
 

diff --git a/onak.ini.in b/onak.ini.in
index 92e02d80caf50dd00c87e1df34a99cdaf7f69d8d..fd6b9e499481245ba0645033e0f00744c96b5a09 100644 (file)
--- a/onak.ini.in
+++ b/onak.ini.in
@@ -9,7 +9,7 @@ logfile=@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/log/onak.log
 loglevel=3
 ; Should we use the keyd backend?
 use_keyd=false
-sock_dir=@CMAKE_INSTALL_FULL_RUNSTATEDIR@
+sock_dir=@CMAKE_INSTALL_FULL_RUNSTATEDIR@/onak
 ; Maximum number of keys to return in a reply to an index, verbose index or
 ; get. Setting it to -1 will allow any size of reply.
 max_reply_keys=128