Merge remote-tracking branch 'origin/1.3'
Conflicts:
build/CMakeLists.txt
src/checks/checker.cc
Dorian Guillois
10 years ago
| 48 | 48 |
DESTINATION "${PREFIX_CONF}"
|
| 49 | 49 |
COMPONENT "runtime"
|
| 50 | 50 |
FILES_MATCHING PATTERN "*.cfg")
|
|
51 |
|
|
52 |
install(CODE "
|
|
53 |
function(my_chown user group file)
|
|
54 |
if (APPLE OR (UNIX AND NOT CYGWIN))
|
|
55 |
execute_process(COMMAND \"chown\" \"\${user}:\${group}\" \"\${file}\")
|
|
56 |
endif ()
|
|
57 |
endfunction()
|
|
58 |
|
|
59 |
my_chown(\"${USER}\" \"${GROUP}\" \"${PREFIX_CONF}/centengine.cfg\")
|
|
60 |
my_chown(\"${USER}\" \"${GROUP}\" \"${PREFIX_CONF}/resource.cfg\")
|
|
61 |
my_chown(\"${USER}\" \"${GROUP}\" \"${PREFIX_CONF}/objects/commands.cfg\")
|
|
62 |
my_chown(\"${USER}\" \"${GROUP}\" \"${PREFIX_CONF}/objects/contacts.cfg\")
|
|
63 |
my_chown(\"${USER}\" \"${GROUP}\" \"${PREFIX_CONF}/objects/localhost.cfg\")
|
|
64 |
my_chown(\"${USER}\" \"${GROUP}\" \"${PREFIX_CONF}/objects/printer.cfg\")
|
|
65 |
my_chown(\"${USER}\" \"${GROUP}\" \"${PREFIX_CONF}/objects/switch.cfg\")
|
|
66 |
my_chown(\"${USER}\" \"${GROUP}\" \"${PREFIX_CONF}/objects/templates.cfg\")
|
|
67 |
my_chown(\"${USER}\" \"${GROUP}\" \"${PREFIX_CONF}/objects/timeperiods.cfg\")
|
|
68 |
my_chown(\"${USER}\" \"${GROUP}\" \"${PREFIX_CONF}/objects/windows.cfg\")
|
|
69 |
")
|
| 51 | 70 |
endif ()
|
| 17 | 17 |
|
| 18 | 18 |
prefix=@CMAKE_INSTALL_PREFIX@
|
| 19 | 19 |
var_dir=@VAR_DIR@
|
|
20 |
rw_dir=@RW_DIR@
|
| 20 | 21 |
binary=@PREFIX_BIN@/centengine
|
| 21 | 22 |
config_file=@PREFIX_CONF@/centengine.cfg
|
| 22 | 23 |
status_file=$var_dir/status.dat
|
| 23 | 24 |
retention_file=$var_dir/retention.dat
|
| 24 | |
command_file=$var_dir/centengine.cmd
|
|
25 |
command_file=$rw_dir/centengine.cmd
|
| 25 | 26 |
lock_file=@LOCK_FILE@
|
| 26 | 27 |
pid_file=@PID_FILE@
|
| 27 | 28 |
user=@USER@
|
| 472 | 472 |
throw (engine_error() << "attempt to run active check on service '"
|
| 473 | 473 |
<< svc->description << "' on host '" << svc->host_ptr->name
|
| 474 | 474 |
<< "' with no check command");
|
|
475 |
|
| 475 | 476 |
logger(dbg_checks, basic)
|
| 476 | 477 |
<< "** Running async check of service '" << svc->description
|
| 477 | 478 |
<< "' on host '" << svc->host_name << "'...";
|