Skip to content

Commit

Permalink
Agent bakery super_server: Move config files from /etc to our config
Browse files Browse the repository at this point in the history
This is a preparation step for supporting the new single directory
deployment for agent packages.

By that, we want to step away from supporting /etc/check_mk as additional
configuration for baked agents. It will still be possible to deploy files
explicitly under /etc, since this is also part of the official Bakery API,
but we will stop to deploy any of our own config files there.

This change is compatible with the raw edition, where both paths
resolve to /etc/check_mk equally.

CMK-19980

Change-Id: I994f97dacddf238da544f9612c9715a2c3a61432
  • Loading branch information
andiumbreit committed Nov 15, 2024
1 parent 11997e6 commit b875d10
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion agents/scripts/super-server/1_xinetd/setup
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
# This file is part of Checkmk (https://checkmk.com). It is subject to the terms and
# conditions defined in the file COPYING, which is part of this source code package.

: "${MK_CONFDIR:="/etc/check_mk"}"

MYSELF="$(realpath -- "$0" || printf "%s" "$0")"
TEMPLATE="/etc/check_mk/xinetd-service-template.cfg"
TEMPLATE="${MK_CONFDIR}/xinetd-service-template.cfg"
DESTINATION="/etc/xinetd.d"
SERVICE_FILE="check-mk-agent"
# In a CCE you can configure auto registration, that cannot be achieved with xinetd
Expand Down
4 changes: 3 additions & 1 deletion agents/scripts/super-server/setup
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
# This file is part of Checkmk (https://checkmk.com). It is subject to the terms and
# conditions defined in the file COPYING, which is part of this source code package.

CONFIG="/etc/check_mk/super-server.cfg"
: "${MK_CONFDIR:="/etc/check_mk"}"

CONFIG="${MK_CONFDIR}/super-server.cfg"

MODULES_DIR="$(dirname "$(realpath -- "$0" || printf "%s" "$0")")"

Expand Down

0 comments on commit b875d10

Please sign in to comment.