Increase version to 2.2.0p17

README.md

@@ -49,11 +49,11 @@ Create your own "check_mk.user.yml.j2" and override `checkmk_agent_win_config_sr
 
 | CheckMK Raw Edition Version | Role Version/Tag |
 | --------------------------- | ---------------- |
+| 2.2.0p17                    | 1.0.79           |
 | 2.2.0p16                    | 1.0.78           |
 | 2.2.0p15                    | 1.0.77           |
 | 2.2.0p14                    | 1.0.76           |
 | 2.2.0p12                    | 1.0.75           |
-| 2.2.0p11                    | 1.0.74           |
 
 ## Requirements
 
@@ -158,7 +158,7 @@ Some of these may be seem redundant but are specified so future users can overri
 | checkmk_agent_sudo_src | Filename of the "sudoers.d" file template | `"99_cmkagent.j2"` |
 | checkmk_agent_sudo_validate | Command used to validate the "sudoers.d" file; %s will be filled in with `checkmk_agent_sudo_dest` | `'visudo -cf %s'` |
 | checkmk_agent_user | Login name of the CheckMK Agent user | `"cmkagent"` |
-| checkmk_agent_version | Version of CheckMK Agent to install | `"2.2.0p16"` |
+| checkmk_agent_version | Version of CheckMK Agent to install | `"2.2.0p17"` |
 | checkmk_agent_win_config_dest | Full pathname of configuration file | `"{{ checkmk_agent_win_data_folder }}check_mk.user.yml"` |
 | checkmk_agent_win_config_src | Filename of the configuration file template | `"check_mk.user.yml.j2"` |
 | checkmk_agent_win_data_folder | Full pathname of the CheckMK Agent data folder | `"C:\\ProgramData\\checkmk\\agent\\"` |

defaults/main.yml

@@ -88,7 +88,7 @@ checkmk_agent_sudo_owner: "root"
 checkmk_agent_sudo_src: "99_cmkagent.j2"
 checkmk_agent_sudo_validate: 'visudo -cf %s'
 checkmk_agent_user: "cmkagent"
-checkmk_agent_version: "2.2.0p16"
+checkmk_agent_version: "2.2.0p17"
 checkmk_agent_win_config_dest: "{{ checkmk_agent_win_data_folder }}check_mk.user.yml"
 checkmk_agent_win_config_src: "check_mk.user.yml.j2"
 checkmk_agent_win_data_folder: "C:\\ProgramData\\checkmk\\agent\\"

templates/check_mk_agent.linux.j2

@@ -1175,14 +1175,24 @@ section_omd_core() {
     (
         cd /omd/sites || return
 
+        # The files within a site are site-user writable! Therefore we must not use them!
+        # The version files are only root writable so we can use them instead.
+        site_version() {
+            printf "%s" "$(realpath "${1}/version" | sed 's|.*/||')"
+        }
+
         site_cmd() {
             # DO NOT ACCESS /omd/sites/${site}/bin/cmd directly.
             # bin might point anywhere -> priv escalation.
-            printf "/omd/versions/%s/bin/%s" "$(realpath "${1}/version" | sed 's|.*/||')" "${2}"
+            printf "/omd/versions/%s/bin/%s" "$(site_version "${1}")" "${2}"
+}
+
+        site_lib() {
+            printf "/omd/versions/%s/lib" "$(site_version "${1}")"
         }
 
         waitmax_for_unixcat_with_site_ld_library_path() {
-            LD_LIBRARY_PATH="/omd/sites/${2}/lib:${LD_LIBRARY_PATH}" waitmax "${1}" "$(site_cmd "${2}" unixcat)" "/omd/sites/${2}/tmp/run/${3}"
+            LD_LIBRARY_PATH="$(site_lib "${2}"):${LD_LIBRARY_PATH}" waitmax "${1}" "$(site_cmd "${2}" unixcat)" "/omd/sites/${2}/tmp/run/${3}"
         }
 
         echo '<<<livestatus_status:sep(59)>>>'