Revision 7e97aca4
b/lib/tools/ensure_dirs.py | ||
---|---|---|
123 | 123 |
confd_log = pathutils.GetLogFilename(constants.CONFD) |
124 | 124 |
rapi_log = pathutils.GetLogFilename(constants.RAPI) |
125 | 125 |
|
126 |
rapi_dir = os.path.join(constants.DATA_DIR, "rapi")
|
|
126 |
rapi_dir = os.path.join(pathutils.DATA_DIR, "rapi")
|
|
127 | 127 |
|
128 | 128 |
paths = [ |
129 |
(constants.DATA_DIR, DIR, 0755, getent.masterd_uid,
|
|
129 |
(pathutils.DATA_DIR, DIR, 0755, getent.masterd_uid,
|
|
130 | 130 |
getent.masterd_gid), |
131 |
(constants.CLUSTER_DOMAIN_SECRET_FILE, FILE, 0640,
|
|
131 |
(pathutils.CLUSTER_DOMAIN_SECRET_FILE, FILE, 0640,
|
|
132 | 132 |
getent.masterd_uid, getent.masterd_gid, False), |
133 |
(constants.CLUSTER_CONF_FILE, FILE, 0640, getent.masterd_uid,
|
|
133 |
(pathutils.CLUSTER_CONF_FILE, FILE, 0640, getent.masterd_uid,
|
|
134 | 134 |
getent.confd_gid, False), |
135 |
(constants.CONFD_HMAC_KEY, FILE, 0440, getent.confd_uid,
|
|
135 |
(pathutils.CONFD_HMAC_KEY, FILE, 0440, getent.confd_uid,
|
|
136 | 136 |
getent.masterd_gid, False), |
137 |
(constants.SSH_KNOWN_HOSTS_FILE, FILE, 0644, getent.masterd_uid,
|
|
137 |
(pathutils.SSH_KNOWN_HOSTS_FILE, FILE, 0644, getent.masterd_uid,
|
|
138 | 138 |
getent.masterd_gid, False), |
139 |
(constants.RAPI_CERT_FILE, FILE, 0440, getent.rapi_uid,
|
|
139 |
(pathutils.RAPI_CERT_FILE, FILE, 0440, getent.rapi_uid,
|
|
140 | 140 |
getent.masterd_gid, False), |
141 |
(constants.SPICE_CERT_FILE, FILE, 0440, getent.noded_uid,
|
|
141 |
(pathutils.SPICE_CERT_FILE, FILE, 0440, getent.noded_uid,
|
|
142 | 142 |
getent.masterd_gid, False), |
143 |
(constants.SPICE_CACERT_FILE, FILE, 0440, getent.noded_uid,
|
|
143 |
(pathutils.SPICE_CACERT_FILE, FILE, 0440, getent.noded_uid,
|
|
144 | 144 |
getent.masterd_gid, False), |
145 |
(constants.NODED_CERT_FILE, FILE, 0440, getent.masterd_uid,
|
|
145 |
(pathutils.NODED_CERT_FILE, FILE, 0440, getent.masterd_uid,
|
|
146 | 146 |
getent.masterd_gid, False), |
147 | 147 |
] |
148 | 148 |
|
... | ... | |
152 | 152 |
getent.noded_uid, 0, False)) |
153 | 153 |
|
154 | 154 |
paths.extend([ |
155 |
(constants.QUEUE_DIR, DIR, 0700, getent.masterd_uid,
|
|
155 |
(pathutils.QUEUE_DIR, DIR, 0700, getent.masterd_uid,
|
|
156 | 156 |
getent.masterd_gid), |
157 |
(constants.QUEUE_DIR, QUEUE_DIR, 0600, getent.masterd_uid,
|
|
157 |
(pathutils.QUEUE_DIR, QUEUE_DIR, 0600, getent.masterd_uid,
|
|
158 | 158 |
getent.masterd_gid), |
159 |
(constants.JOB_QUEUE_LOCK_FILE, FILE, 0600,
|
|
159 |
(pathutils.JOB_QUEUE_LOCK_FILE, FILE, 0600,
|
|
160 | 160 |
getent.masterd_uid, getent.masterd_gid, False), |
161 |
(constants.JOB_QUEUE_SERIAL_FILE, FILE, 0600,
|
|
161 |
(pathutils.JOB_QUEUE_SERIAL_FILE, FILE, 0600,
|
|
162 | 162 |
getent.masterd_uid, getent.masterd_gid, False), |
163 |
(constants.JOB_QUEUE_VERSION_FILE, FILE, 0600,
|
|
163 |
(pathutils.JOB_QUEUE_VERSION_FILE, FILE, 0600,
|
|
164 | 164 |
getent.masterd_uid, getent.masterd_gid, False), |
165 |
(constants.JOB_QUEUE_ARCHIVE_DIR, DIR, 0700,
|
|
165 |
(pathutils.JOB_QUEUE_ARCHIVE_DIR, DIR, 0700,
|
|
166 | 166 |
getent.masterd_uid, getent.masterd_gid), |
167 | 167 |
(rapi_dir, DIR, 0750, getent.rapi_uid, getent.masterd_gid), |
168 |
(constants.RAPI_USERS_FILE, FILE, 0640, getent.rapi_uid,
|
|
168 |
(pathutils.RAPI_USERS_FILE, FILE, 0640, getent.rapi_uid,
|
|
169 | 169 |
getent.masterd_gid, False), |
170 |
(constants.RUN_DIR, DIR, 0775, getent.masterd_uid,
|
|
170 |
(pathutils.RUN_DIR, DIR, 0775, getent.masterd_uid,
|
|
171 | 171 |
getent.daemons_gid), |
172 |
(constants.SOCKET_DIR, DIR, 0750, getent.masterd_uid,
|
|
172 |
(pathutils.SOCKET_DIR, DIR, 0750, getent.masterd_uid,
|
|
173 | 173 |
getent.daemons_gid), |
174 |
(constants.MASTER_SOCKET, FILE, 0770, getent.masterd_uid,
|
|
174 |
(pathutils.MASTER_SOCKET, FILE, 0770, getent.masterd_uid,
|
|
175 | 175 |
getent.daemons_gid, False), |
176 |
(constants.BDEV_CACHE_DIR, DIR, 0755, getent.noded_uid,
|
|
176 |
(pathutils.BDEV_CACHE_DIR, DIR, 0755, getent.noded_uid,
|
|
177 | 177 |
getent.masterd_gid), |
178 |
(constants.UIDPOOL_LOCKDIR, DIR, 0750, getent.noded_uid,
|
|
178 |
(pathutils.UIDPOOL_LOCKDIR, DIR, 0750, getent.noded_uid,
|
|
179 | 179 |
getent.masterd_gid), |
180 |
(constants.DISK_LINKS_DIR, DIR, 0755, getent.noded_uid,
|
|
180 |
(pathutils.DISK_LINKS_DIR, DIR, 0755, getent.noded_uid,
|
|
181 | 181 |
getent.masterd_gid), |
182 |
(constants.CRYPTO_KEYS_DIR, DIR, 0700, getent.noded_uid,
|
|
182 |
(pathutils.CRYPTO_KEYS_DIR, DIR, 0700, getent.noded_uid,
|
|
183 | 183 |
getent.masterd_gid), |
184 |
(constants.IMPORT_EXPORT_DIR, DIR, 0755, getent.noded_uid,
|
|
184 |
(pathutils.IMPORT_EXPORT_DIR, DIR, 0755, getent.noded_uid,
|
|
185 | 185 |
getent.masterd_gid), |
186 |
(constants.LOG_DIR, DIR, 0770, getent.masterd_uid,
|
|
186 |
(pathutils.LOG_DIR, DIR, 0770, getent.masterd_uid,
|
|
187 | 187 |
getent.daemons_gid), |
188 | 188 |
(masterd_log, FILE, 0600, getent.masterd_uid, getent.masterd_gid, |
189 | 189 |
False), |
190 | 190 |
(confd_log, FILE, 0600, getent.confd_uid, getent.masterd_gid, False), |
191 | 191 |
(noded_log, FILE, 0600, getent.noded_uid, getent.masterd_gid, False), |
192 | 192 |
(rapi_log, FILE, 0600, getent.rapi_uid, getent.masterd_gid, False), |
193 |
(constants.LOG_OS_DIR, DIR, 0750, getent.masterd_uid,
|
|
193 |
(pathutils.LOG_OS_DIR, DIR, 0750, getent.masterd_uid,
|
|
194 | 194 |
getent.daemons_gid), |
195 | 195 |
]) |
196 | 196 |
|
... | ... | |
254 | 254 |
ProcessPath(path) |
255 | 255 |
|
256 | 256 |
if opts.full_run: |
257 |
RecursiveEnsure(constants.JOB_QUEUE_ARCHIVE_DIR, getent.masterd_uid,
|
|
257 |
RecursiveEnsure(pathutils.JOB_QUEUE_ARCHIVE_DIR, getent.masterd_uid,
|
|
258 | 258 |
getent.masterd_gid, 0700, 0600) |
259 | 259 |
except errors.GenericError, err: |
260 | 260 |
logging.error("An error occurred while setting permissions: %s", err) |
Also available in: Unified diff