Revision fe05a931 lib/tools/ensure_dirs.py

b/lib/tools/ensure_dirs.py
159 159
                  getent.noded_uid, getent.noded_gid, False))
160 160

  
161 161
  paths.extend([
162
    (pathutils.QUEUE_DIR, DIR, 0700, getent.masterd_uid, getent.masterd_gid),
163
    (pathutils.QUEUE_DIR, QUEUE_DIR, 0600,
164
     getent.masterd_uid, getent.masterd_gid),
162
    (pathutils.QUEUE_DIR, DIR, 0750, getent.masterd_uid, getent.daemons_gid),
163
    (pathutils.QUEUE_DIR, QUEUE_DIR, constants.JOB_QUEUE_FILES_PERMS,
164
     getent.masterd_uid, getent.daemons_gid),
165 165
    (pathutils.JOB_QUEUE_DRAIN_FILE, FILE, 0644,
166
     getent.masterd_uid, getent.masterd_gid, False),
167
    (pathutils.JOB_QUEUE_LOCK_FILE, FILE, 0600,
168
     getent.masterd_uid, getent.masterd_gid, False),
169
    (pathutils.JOB_QUEUE_SERIAL_FILE, FILE, 0600,
170
     getent.masterd_uid, getent.masterd_gid, False),
171
    (pathutils.JOB_QUEUE_VERSION_FILE, FILE, 0600,
172
     getent.masterd_uid, getent.masterd_gid, False),
173
    (pathutils.JOB_QUEUE_ARCHIVE_DIR, DIR, 0700,
174
     getent.masterd_uid, getent.masterd_gid),
166
     getent.masterd_uid, getent.daemons_gid, False),
167
    (pathutils.JOB_QUEUE_LOCK_FILE, FILE, constants.JOB_QUEUE_FILES_PERMS,
168
     getent.masterd_uid, getent.daemons_gid, False),
169
    (pathutils.JOB_QUEUE_SERIAL_FILE, FILE, constants.JOB_QUEUE_FILES_PERMS,
170
     getent.masterd_uid, getent.daemons_gid, False),
171
    (pathutils.JOB_QUEUE_VERSION_FILE, FILE, constants.JOB_QUEUE_FILES_PERMS,
172
     getent.masterd_uid, getent.daemons_gid, False),
173
    (pathutils.JOB_QUEUE_ARCHIVE_DIR, DIR, 0740,
174
     getent.masterd_uid, getent.daemons_gid),
175 175
    (rapi_dir, DIR, 0750, getent.rapi_uid, getent.masterd_gid),
176 176
    (pathutils.RAPI_USERS_FILE, FILE, 0640,
177 177
     getent.rapi_uid, getent.masterd_gid, False),
......
244 244

  
245 245
    if opts.full_run:
246 246
      RecursiveEnsure(pathutils.JOB_QUEUE_ARCHIVE_DIR, getent.masterd_uid,
247
                      getent.masterd_gid, 0700, 0600)
247
                      getent.daemons_gid, 0750, constants.JOB_QUEUE_FILES_PERMS)
248 248
  except errors.GenericError, err:
249 249
    logging.error("An error occurred while setting permissions: %s", err)
250 250
    return constants.EXIT_FAILURE

Also available in: Unified diff