Revision b370482d daemons/ensure-dirs.in

b/daemons/ensure-dirs.in
74 74
}
75 75

  
76 76
_ensure_datadir() {
77
  local full_run="$1"
78

  
77 79
  _ensure_dir ${DATADIR} 0755 "$(_fileset_owner masterd)"
78 80
  _ensure_dir ${DATADIR}/queue 0700 "$(_fileset_owner masterd)"
79 81
  _ensure_dir ${DATADIR}/queue/archive 0700 "$(_fileset_owner masterd)"
......
94 96
  touch ${DATADIR}/queue/lock
95 97
  _ensure_file ${DATADIR}/queue/lock 0600 "$(_fileset_owner masterd)"
96 98

  
97
  for file in $(_gather_files ${DATADIR}/queue 0600 @GNTMASTERUSER@ \
98
                @GNTMASTERDGROUP@); do
99
    _ensure_file "${file}" 0600 "$(_fileset_owner masterd)"
100
  done
99
  if ! [[ -z "${full_run}" ]]; then
100
    for file in $(_gather_files ${DATADIR}/queue 0600 @GNTMASTERUSER@ \
101
                  @GNTMASTERDGROUP@); do
102
      _ensure_file "${file}" 0600 "$(_fileset_owner masterd)"
103
    done
101 104

  
102
  for file in $(_gather_files ${DATADIR} 0600 root \
103
                @GNTMASTERDGROUP@ -name 'ssconf_*'); do
104
    _ensure_file "${file}" 0444 "$(_fileset_owner noded)"
105
  done
105
    for file in $(_gather_files ${DATADIR} 0600 root \
106
                  @GNTMASTERDGROUP@ -name 'ssconf_*'); do
107
      _ensure_file "${file}" 0444 "$(_fileset_owner noded)"
108
    done
109
  fi
106 110
}
107 111

  
108 112
_ensure_rundir() {
......
143 147
}
144 148

  
145 149
main() {
146
  _operate_while_hold "_ensure_datadir" ${DATADIR}
150
  local full_run
151

  
152
  while getopts "f" OPTION; do
153
    case ${OPTION} in
154
      f) full_run=1 ;;
155
    esac
156
  done
157

  
158
  _operate_while_hold "_ensure_datadir" ${DATADIR} ${full_run}
147 159
  _operate_while_hold "_ensure_rundir" ${RUNDIR}
148 160
  _operate_while_hold "_ensure_logdir" ${LOGDIR}
149 161
  _operate_while_hold "_ensure_lockdir" @LOCALSTATEDIR@

Also available in: Unified diff