Branch: refs/heads/master Home: https://github.com/tribe29/checkmk Commit: 412dc99c33b48b1816334efe929084eb1c043874 https://github.com/tribe29/checkmk/commit/412dc99c33b48b1816334efe929084eb1… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2022-09-07 (Wed, 07 Sep 2022) Changed paths: A .werks/14293 M cmk/gui/utils/timeout_manager.py M docker/docker-entrypoint.sh M omd/packages/apache-omd/APACHE_TCP_ADDR M omd/packages/apache-omd/APACHE_TCP_PORT M omd/packages/apache-omd/skel/etc/apache/apache.conf M omd/packages/omd/hooks/APACHE_MODE M omd/packages/omd/omdlib/main.py M omd/packages/omd/omdlib/system_apache.py M tests/unit/omdlib/test_system_apache.py Log Message: ----------- Revert "Revert "14293 FIX Enforce use of new apache hooks before updating to 2.2"" This reverts commit e3eb9c5505b0bbc332c592e66aa1ff8cda93b57c. Change-Id: I4fb0da9a2bf6b51042525af1684b15098a2dc304 Commit: 6e0c5a4d2c2af40d47029d4e98fc030e2e9fc075 https://github.com/tribe29/checkmk/commit/6e0c5a4d2c2af40d47029d4e98fc030e2… Author: Lars Michelsen <lm(a)tribe29.com> Date: 2022-09-07 (Wed, 07 Sep 2022) Changed paths: M docker/docker-entrypoint.sh M omd/packages/omd/omdlib/main.py Log Message: ----------- Fix container update * 'omd -f update' is not performing the apache hook validation anymore which will make the container update continue. * Right after the update we add 'omd update-apache-config' which can then create the apache hook for the current Checkmk version Change-Id: I0971ac4ec31720ae96c42c5081f0727f262a27c1 Compare: https://github.com/tribe29/checkmk/compare/e3eb9c5505b0...6e0c5a4d2c2a