Revision 14013e5d configure.ac
| b/configure.ac | ||
|---|---|---|
| 243 | 243 |
[user_masterd="${withval}masterd";
|
| 244 | 244 |
user_rapi="${withval}rapi";
|
| 245 | 245 |
user_confd="${withval}confd";
|
| 246 |
user_noded="$user_default"], |
|
| 246 |
user_noded="$user_default"; |
|
| 247 |
user_mond="${withval}mond"],
|
|
| 247 | 248 |
[user_masterd="$user_default"; |
| 248 | 249 |
user_rapi="$user_default"; |
| 249 | 250 |
user_confd="$user_default"; |
| 250 |
user_noded="$user_default"]) |
|
| 251 |
user_noded="$user_default"; |
|
| 252 |
user_mond="$user_default"]) |
|
| 251 | 253 |
AC_SUBST(MASTERD_USER, $user_masterd) |
| 252 | 254 |
AC_SUBST(RAPI_USER, $user_rapi) |
| 253 | 255 |
AC_SUBST(CONFD_USER, $user_confd) |
| 254 | 256 |
AC_SUBST(NODED_USER, $user_noded) |
| 257 |
AC_SUBST(MOND_USER, $user_mond) |
|
| 255 | 258 |
|
| 256 | 259 |
# --with-group-prefix=... |
| 257 | 260 |
AC_ARG_WITH([group-prefix], |
| ... | ... | |
| 265 | 268 |
group_confd="${withval}confd";
|
| 266 | 269 |
group_masterd="${withval}masterd";
|
| 267 | 270 |
group_noded="$group_default"; |
| 268 |
group_daemons="${withval}daemons";],
|
|
| 271 |
group_daemons="${withval}daemons";
|
|
| 272 |
group_mond="${withval}mond"],
|
|
| 269 | 273 |
[group_rapi="$group_default"; |
| 270 | 274 |
group_admin="$group_default"; |
| 271 | 275 |
group_confd="$group_default"; |
| 272 | 276 |
group_masterd="$group_default"; |
| 273 | 277 |
group_noded="$group_default"; |
| 274 |
group_daemons="$group_default"]) |
|
| 278 |
group_daemons="$group_default"; |
|
| 279 |
group_mond="$group_default"]) |
|
| 275 | 280 |
AC_SUBST(RAPI_GROUP, $group_rapi) |
| 276 | 281 |
AC_SUBST(ADMIN_GROUP, $group_admin) |
| 277 | 282 |
AC_SUBST(CONFD_GROUP, $group_confd) |
| 278 | 283 |
AC_SUBST(MASTERD_GROUP, $group_masterd) |
| 279 | 284 |
AC_SUBST(NODED_GROUP, $group_noded) |
| 280 | 285 |
AC_SUBST(DAEMONS_GROUP, $group_daemons) |
| 286 |
AC_SUBST(MOND_GROUP, $group_mond) |
|
| 281 | 287 |
|
| 282 | 288 |
# Print the config to the user |
| 283 | 289 |
AC_MSG_NOTICE([Running ganeti-masterd as $group_masterd:$group_masterd]) |
| ... | ... | |
| 475 | 481 |
[], |
| 476 | 482 |
[enable_confd=check]) |
| 477 | 483 |
|
| 478 |
ENABLE_MONITORING=
|
|
| 484 |
ENABLE_MOND=
|
|
| 479 | 485 |
AC_ARG_ENABLE([monitoring], |
| 480 | 486 |
[AS_HELP_STRING([--enable-monitoring], |
| 481 | 487 |
[enable the ganeti monitoring agent (default: check)])], |
| ... | ... | |
| 573 | 579 |
if test "$has_monitoring" = True; then |
| 574 | 580 |
AC_MSG_NOTICE([Enabling the monitoring agent usage]) |
| 575 | 581 |
fi |
| 576 |
AC_SUBST(ENABLE_MONITORING, $has_monitoring)
|
|
| 577 |
AM_CONDITIONAL([ENABLE_MONITORING], [test "$has_monitoring" = True])
|
|
| 582 |
AC_SUBST(ENABLE_MOND, $has_monitoring)
|
|
| 583 |
AM_CONDITIONAL([ENABLE_MOND], [test "$has_monitoring" = True])
|
|
| 578 | 584 |
|
| 579 | 585 |
# development modules |
| 580 | 586 |
HS_NODEV= |
Also available in: Unified diff