Increase version to 2.3.0p14

README.md

@@ -52,11 +52,11 @@ Similar modifications have been made to the `docker.cfg` default file.  Here, al
 
 | CheckMK Raw Edition Version | Role Version/Tag |
 | --------------------------- | ---------------- |
+| 2.3.0p14                    | 1.1.2            |
 | 2.3.0p13                    | 1.1.1            |
 | 2.3.0p12                    | 1.1.0            |
 | 2.3.0p11                    | 1.0.99           |
 | 2.3.0p10                    | 1.0.98           |
-| 2.3.0p9                     | 1.0.97           |
 
 ## Requirements
 
@@ -162,7 +162,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.3.0p13` |
+| checkmk_agent_version | Version of CheckMK Agent to install | `2.3.0p14` |
 | checkmk_agent_win_config_dest | Full pathname of configuration file | `"{{ checkmk_agent_win_data_folder }}check_mk.user.yml"` |
 | checkmk_agent_win_config_optimize | Optimize the Windows agent by dropping some of the slower checks | `true` |
 | checkmk_agent_win_config_src | Filename of the configuration file template | `check_mk.user.yml.j2` |

defaults/main.yml

@@ -89,7 +89,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.3.0p13
+checkmk_agent_version: 2.3.0p14
 checkmk_agent_win_config_dest: "{{ checkmk_agent_win_data_folder }}check_mk.user.yml"
 checkmk_agent_win_config_optimize: true
 checkmk_agent_win_config_src: check_mk.user.yml.j2

templates/check_mk.user.yml.j2

@@ -1,5 +1,4 @@
 # {{ ansible_managed }}
-
 # Copyright (C) 2019 Checkmk GmbH - License: GNU General Public License v2
 # 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.

templates/mk_postgres.py.j2

@@ -1213,14 +1213,18 @@ def parse_env_file(env_file):
     pg_port = None  # mandatory in env_file
     pg_database = "postgres"  # default value
     pg_version = None
+
     for line in open_env_file(env_file):
         line = line.strip()
+        if not line or "=" not in line or line.startswith("#"):
+            continue
         if "PGDATABASE=" in line:
             pg_database = re.sub(re.compile("#.*"), "", line.split("=")[-1]).strip()
         elif "PGPORT=" in line:
             pg_port = re.sub(re.compile("#.*"), "", line.split("=")[-1]).strip()
         elif "PGVERSION=" in line:
             pg_version = re.sub(re.compile("#.*"), "", line.split("=")[-1]).strip()
+
     if pg_port is None:
         raise ValueError("PGPORT is not specified in %s" % env_file)
     return pg_database, pg_port, pg_version