LUOsDiagnose: Move legacy behaviour into filter

[ganeti-local] / daemons / ensure-dirs.in

diff --git a/daemons/ensure-dirs.in b/daemons/ensure-dirs.in
index 252f24a..ff6d744 100644 (file)
--- a/daemons/ensure-dirs.in
+++ b/daemons/ensure-dirs.in
@@ -80,6 +80,7 @@ _ensure_datadir() {
   _ensure_dir ${DATADIR}/queue 0700 "$(_fileset_owner masterd)"
   _ensure_dir ${DATADIR}/queue/archive 0700 "$(_fileset_owner masterd)"
   _ensure_dir ${DATADIR}/uidpool 0750 "$(_fileset_owner noded)"
+  _ensure_dir ${DATADIR}/rapi 0750 "$(_fileset_owner rapi)"
 
   # We ignore these files if they don't exists (incomplete setup)
   _ensure_file ${DATADIR}/cluster-domain-secret 0640 \
@@ -88,7 +89,7 @@ _ensure_datadir() {
   _ensure_file ${DATADIR}/hmac.key 0440 "$(_fileset_owner confd)" || :
   _ensure_file ${DATADIR}/known_hosts 0644 "$(_fileset_owner masterd)" || :
   _ensure_file ${DATADIR}/rapi.pem 0440 "$(_fileset_owner rapi)" || :
-  _ensure_file ${DATADIR}/rapi_users 0640 "$(_fileset_owner rapi)" || :
+  _ensure_file ${DATADIR}/rapi/users 0640 "$(_fileset_owner rapi)" || :
   _ensure_file ${DATADIR}/server.pem 0440 "$(_fileset_owner masterd)" || :
   _ensure_file ${DATADIR}/queue/serial 0600 "$(_fileset_owner masterd)" || :
 
@@ -97,14 +98,17 @@ _ensure_datadir() {
   _ensure_file ${DATADIR}/queue/lock 0600 "$(_fileset_owner masterd)"
 
   if ! [[ -z "${full_run}" ]]; then
-    for file in $(_gather_files ${DATADIR}/queue 0600 @GNTMASTERUSER@ \
-                  @GNTMASTERDGROUP@); do
-      _ensure_file "${file}" 0600 "$(_fileset_owner masterd)"
+    local queue_owner="$(_fileset_owner masterd)"
+    local ssconf_owner="$(_fileset_owner noded)"
+
+    _gather_files ${DATADIR}/queue 0600 @GNTMASTERUSER@ @GNTMASTERDGROUP@ | \
+    while read path; do
+      _ensure_file "$path" 0600 "$queue_owner"
     done
 
-    for file in $(_gather_files ${DATADIR} 0600 root \
-                  @GNTMASTERDGROUP@ -name 'ssconf_*'); do
-      _ensure_file "${file}" 0444 "$(_fileset_owner noded)"
+    _gather_files ${DATADIR} 0600 root @GNTMASTERDGROUP@ -name 'ssconf_*' | \
+    while read path; do
+      _ensure_file "$path" 0444 "$ssconf_owner"
     done
   fi
 }