Use mod_version to clean-up apache version matching

This change uses mod_version (shipped by default on everything we care
about) to set-up version-specific config within apache rather than
within devstack scripts.

Clean up the horizon and keystone config file generation to use the
internal apache matching.

Since I6478db385fda2fa1c75ced12d3e886b2e1152852 the apache matching in
'functions' is actually duplicated.  just leave get_apache_version in
lib/apache as it is used for config-file name matching in there.

Change-Id: I6478db385fda2fa1c75ced12d3e886b2e1152852
This commit is contained in:
Noboru Iwamatsu
2014-07-02 18:31:31 +09:00
committed by Ian Wienand
parent 3d458eb703
commit b4495eb410
6 changed files with 20 additions and 31 deletions
+5
View File
@@ -59,6 +59,11 @@ function install_apache_wsgi {
else
exit_distro_not_supported "apache installation"
fi
# ensure mod_version enabled for <IfVersion ...>. This is
# built-in statically on anything recent, but precise (2.2)
# doesn't have it enabled
sudo a2enmod version || true
}
# get_apache_version() - return the version of Apache installed