Revision d08a8359
| b/lib/constants.py | ||
|---|---|---|
| 192 | 192 |
DAEMONS_LOGBASE = {
|
| 193 | 193 |
NODED: "node-daemon", |
| 194 | 194 |
CONFD: "conf-daemon", |
| 195 |
LUXID: "query-daemon",
|
|
| 195 |
LUXID: "luxi-daemon",
|
|
| 196 | 196 |
RAPI: "rapi-daemon", |
| 197 | 197 |
MASTERD: "master-daemon", |
| 198 | 198 |
MOND: "monitoring-daemon", |
| b/lib/runtime.py | ||
|---|---|---|
| 104 | 104 |
self.noded_uid = GetUid(constants.NODED_USER, _getpwnam) |
| 105 | 105 |
self.noded_gid = GetGid(constants.NODED_GROUP, _getgrnam) |
| 106 | 106 |
|
| 107 |
self.mond_uid = GetUid(constants.MOND_USER, _getpwnam) |
|
| 108 |
self.mond_gid = GetGid(constants.MOND_GROUP, _getgrnam) |
|
| 109 |
|
|
| 107 | 110 |
# Misc Ganeti groups |
| 108 | 111 |
self.daemons_gid = GetGid(constants.DAEMONS_GROUP, _getgrnam) |
| 109 | 112 |
self.admin_gid = GetGid(constants.ADMIN_GROUP, _getgrnam) |
| ... | ... | |
| 114 | 117 |
self.luxid_uid: constants.LUXID_USER, |
| 115 | 118 |
self.rapi_uid: constants.RAPI_USER, |
| 116 | 119 |
self.noded_uid: constants.NODED_USER, |
| 120 |
self.mond_uid: constants.MOND_USER, |
|
| 117 | 121 |
} |
| 118 | 122 |
|
| 119 | 123 |
self._gid2group = {
|
| ... | ... | |
| 122 | 126 |
self.luxid_gid: constants.LUXID_GROUP, |
| 123 | 127 |
self.rapi_gid: constants.RAPI_GROUP, |
| 124 | 128 |
self.noded_gid: constants.NODED_GROUP, |
| 129 |
self.mond_gid: constants.MOND_GROUP, |
|
| 125 | 130 |
self.daemons_gid: constants.DAEMONS_GROUP, |
| 126 | 131 |
self.admin_gid: constants.ADMIN_GROUP, |
| 127 | 132 |
} |
| b/lib/tools/ensure_dirs.py | ||
|---|---|---|
| 122 | 122 |
masterd_log = constants.DAEMONS_LOGFILES[constants.MASTERD] |
| 123 | 123 |
noded_log = constants.DAEMONS_LOGFILES[constants.NODED] |
| 124 | 124 |
confd_log = constants.DAEMONS_LOGFILES[constants.CONFD] |
| 125 |
luxid_log = constants.DAEMONS_LOGFILES[constants.LUXID] |
|
| 125 | 126 |
rapi_log = constants.DAEMONS_LOGFILES[constants.RAPI] |
| 127 |
mond_log = constants.DAEMONS_LOGFILES[constants.MOND] |
|
| 126 | 128 |
|
| 127 | 129 |
rapi_dir = os.path.join(pathutils.DATA_DIR, "rapi") |
| 128 | 130 |
cleaner_log_dir = os.path.join(pathutils.LOG_DIR, "cleaner") |
| ... | ... | |
| 194 | 196 |
(pathutils.LOG_DIR, DIR, 0770, getent.masterd_uid, getent.daemons_gid), |
| 195 | 197 |
(masterd_log, FILE, 0600, getent.masterd_uid, getent.masterd_gid, False), |
| 196 | 198 |
(confd_log, FILE, 0600, getent.confd_uid, getent.masterd_gid, False), |
| 199 |
(luxid_log, FILE, 0600, getent.luxid_uid, getent.masterd_gid, False), |
|
| 197 | 200 |
(noded_log, FILE, 0600, getent.noded_uid, getent.masterd_gid, False), |
| 198 | 201 |
(rapi_log, FILE, 0600, getent.rapi_uid, getent.masterd_gid, False), |
| 202 |
(mond_log, FILE, 0600, getent.mond_uid, getent.masterd_gid, False), |
|
| 199 | 203 |
(pathutils.LOG_OS_DIR, DIR, 0750, getent.noded_uid, getent.daemons_gid), |
| 200 | 204 |
(pathutils.LOG_XEN_DIR, DIR, 0750, getent.noded_uid, getent.daemons_gid), |
| 201 | 205 |
(cleaner_log_dir, DIR, 0750, getent.noded_uid, getent.noded_gid), |
| b/src/Ganeti/Luxi.hs | ||
|---|---|---|
| 228 | 228 |
getServer setOwner path = do |
| 229 | 229 |
s <- S.socket S.AF_UNIX S.Stream S.defaultProtocol |
| 230 | 230 |
S.bindSocket s (S.SockAddrUnix path) |
| 231 |
when setOwner . setOwnerAndGroupFromNames path GanetiConfd $
|
|
| 231 |
when setOwner . setOwnerAndGroupFromNames path GanetiLuxid $
|
|
| 232 | 232 |
ExtraGroup DaemonsGroup |
| 233 | 233 |
S.listen s 5 -- 5 is the max backlog |
| 234 | 234 |
return s |
Also available in: Unified diff