Revision 1c31b263 src/Ganeti/HsConstants.hs

b/src/Ganeti/HsConstants.hs
40 40
import qualified Data.Map as Map (fromList)
41 41

  
42 42
import AutoConf
43
import Ganeti.ConstantUtils
43
import Ganeti.ConstantUtils (FrozenSet, Protocol(..))
44
import qualified Ganeti.ConstantUtils as ConstantUtils (mkSet, exitFailure)
45
import Ganeti.Runtime (GanetiDaemon(..), MiscGroup(..), GanetiGroup(..),
46
                       ExtraLogReason(..))
47
import qualified Ganeti.Runtime as Runtime
44 48

  
45 49
-- * Admin states
46 50

  
......
59 63
-- * User separation
60 64

  
61 65
daemonsGroup :: String
62
daemonsGroup = AutoConf.daemonsGroup
66
daemonsGroup = Runtime.daemonGroup (ExtraGroup DaemonsGroup)
63 67

  
64 68
adminGroup :: String
65
adminGroup = AutoConf.adminGroup
69
adminGroup = Runtime.daemonGroup (ExtraGroup AdminGroup)
66 70

  
67 71
masterdUser :: String
68
masterdUser = AutoConf.masterdUser
72
masterdUser = Runtime.daemonUser GanetiMasterd
69 73

  
70 74
masterdGroup :: String
71
masterdGroup = AutoConf.masterdGroup
75
masterdGroup = Runtime.daemonGroup (DaemonGroup GanetiMasterd)
72 76

  
73 77
rapiUser :: String
74
rapiUser = AutoConf.rapiUser
78
rapiUser = Runtime.daemonUser GanetiRapi
75 79

  
76 80
rapiGroup :: String
77
rapiGroup = AutoConf.rapiGroup
81
rapiGroup = Runtime.daemonGroup (DaemonGroup GanetiRapi)
78 82

  
79 83
confdUser :: String
80
confdUser = AutoConf.confdUser
84
confdUser = Runtime.daemonUser GanetiConfd
81 85

  
82 86
confdGroup :: String
83
confdGroup = AutoConf.confdGroup
87
confdGroup = Runtime.daemonGroup (DaemonGroup GanetiConfd)
84 88

  
85 89
luxidUser :: String
86
luxidUser = AutoConf.luxidUser
90
luxidUser = Runtime.daemonUser GanetiLuxid
87 91

  
88 92
luxidGroup :: String
89
luxidGroup = AutoConf.luxidGroup
93
luxidGroup = Runtime.daemonGroup (DaemonGroup GanetiLuxid)
90 94

  
91 95
nodedUser :: String
92
nodedUser = AutoConf.nodedUser
96
nodedUser = Runtime.daemonUser GanetiNoded
93 97

  
94 98
nodedGroup :: String
95
nodedGroup = AutoConf.nodedGroup
99
nodedGroup = Runtime.daemonGroup (DaemonGroup GanetiNoded)
96 100

  
97 101
mondUser :: String
98
mondUser = AutoConf.mondUser
102
mondUser = Runtime.daemonUser GanetiMond
99 103

  
100 104
mondGroup :: String
101
mondGroup = AutoConf.mondGroup
105
mondGroup = Runtime.daemonGroup (DaemonGroup GanetiMond)
102 106

  
103 107
sshLoginUser :: String
104 108
sshLoginUser = AutoConf.sshLoginUser
......
117 121
-- * Daemons
118 122

  
119 123
confd :: String
120
confd = "ganeti-confd"
124
confd = Runtime.daemonName GanetiConfd
121 125

  
122 126
masterd :: String
123
masterd = "ganeti-masterd"
127
masterd = Runtime.daemonName GanetiMasterd
124 128

  
125 129
mond :: String
126
mond = "ganeti-mond"
130
mond = Runtime.daemonName GanetiMond
127 131

  
128 132
noded :: String
129
noded = "ganeti-noded"
133
noded = Runtime.daemonName GanetiNoded
130 134

  
131 135
luxid :: String
132
luxid = "ganeti-luxid"
136
luxid = Runtime.daemonName GanetiLuxid
133 137

  
134 138
rapi :: String
135
rapi = "ganeti-rapi"
139
rapi = Runtime.daemonName GanetiRapi
136 140

  
137 141
daemons :: FrozenSet String
138 142
daemons =
......
163 167
                (rapi, (Tcp, defaultRapiPort)),
164 168
                (ssh, (Tcp, 22))]
165 169

  
170
extraLogreasonAccess :: String
171
extraLogreasonAccess = Runtime.daemonsExtraLogbase GanetiMond AccessLog
172

  
173
extraLogreasonError :: String
174
extraLogreasonError = Runtime.daemonsExtraLogbase GanetiMond ErrorLog
175

  
166 176
-- * Possible values for NodeGroup.alloc_policy
167 177

  
168 178
allocPolicyLastResort :: String

Also available in: Unified diff