Set the correct group for confd

Starting confd as a member of the daemons group allows the RAPI daemon to access
the LUXI socket.

Fixes Issue 477.

Signed-off-by: Michele Tartara <mtartara@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
index 35d5ed6..2b3d24d 100644 (file)
--- a/daemons/daemon-util.in
+++ b/daemons/daemon-util.in
@@ -80,7 +80,7 @@ _daemon_usergroup() {
       echo "@GNTMASTERUSER@:@GNTMASTERDGROUP@"
       ;;
     confd)
-      echo "@GNTCONFDUSER@:@GNTCONFDGROUP@"
+      echo "@GNTCONFDUSER@:@GNTDAEMONSGROUP@"
       ;;
     rapi)
       echo "@GNTRAPIUSER@:@GNTRAPIGROUP@"
@@ -253,11 +253,6 @@ start() {
       $daemonexec $args "$@"
   fi
 
-  # FIXME: This is a workaround for issue 477. Remove this once confd does not
-  # mess up the permissions anymore.
-  if [[ "$name" == ganeti-confd ]]; then
-    @PKGLIBDIR@/ensure-dirs;
-  fi
 }
 
 # Stops a daemon