Merge remote-tracking branch 'origin/master' into 2.0.x

2026-07-28 08:45:22 +02:00 · 2022-11-11 17:25:42 +11:00
parent f5e7d16303 a8015fa102
commit 1773edcad0
28 changed files with 473 additions and 376 deletions
@@ -119,6 +119,7 @@ def get_apache_configurator(
                        # Custom virtualhost path was requested
                        config.config.apache_vhost_root = conf_vhost_path
                    config.config.apache_ctl = config_class.OS_DEFAULTS.ctl
+                    config.config.apache_bin = config_class.OS_DEFAULTS.bin
                    config.prepare()
    return config