mirror of
https://github.com/certbot/certbot.git
synced 2026-04-04 08:35:12 -04:00
fd6702b869
In CentOS 6 default httpd configuration, the `LoadModule ssl_module ...` is handled in `conf.d/ssl.conf`. As the `VirtualHost` configuration files in `conf.d/` are loaded in alphabetical order, this means that all files that have `<IfModule mod_ssl.c>` and are loaded before `ssl.conf` are effectively ignored. This PR moves the `LoadModule ssl_module` to the main `httpd.conf` while leaving a conditional `LoadModule` directive in `ssl.conf`.
Features
- Reads the module configuration from `ssl.conf` in case some modifications to paths have been made by the user.
- Falls back to default paths if the directive doesn't exist.
- Moves the `LoadModule` directive in `ssl.conf` inside `<IfModule !mod_ssl.c>` to avoid printing warning messages of duplicate module loads.
- Adds `LoadModule ssl_module` inside of `<IfModule !mod_ssl.c>` to the top of the main `httpd.conf`.
- Ensures that these modifications are not made multiple times.
Fixes: #6606
* Fix CentOS6 installer issue
* Changelog entry
* Address review comments
* Do not enable mod_ssl if multiple different values were found
* Add test comment
* Address rest of the review comments
* Address review comments
* Better ifmodule argument checking
* Test fixes
* Make linter happy
* Raise an exception when differing LoadModule ssl_module statements are found
* If IfModule !mod_ssl.c with LoadModule ssl_module already exists in Augeas path, do not create new LoadModule directive
* Do not use deprecated assertion functions
* Address review comments
* Kick tests
* Revert "Kick tests"
This reverts commit
|
||
|---|---|---|
| .. | ||
| augeas_lens | ||
| tests | ||
| __init__.py | ||
| apache_util.py | ||
| augeas_configurator.py | ||
| centos-options-ssl-apache.conf | ||
| configurator.py | ||
| constants.py | ||
| display_ops.py | ||
| entrypoint.py | ||
| http_01.py | ||
| obj.py | ||
| options-ssl-apache.conf | ||
| override_arch.py | ||
| override_centos.py | ||
| override_darwin.py | ||
| override_debian.py | ||
| override_gentoo.py | ||
| override_suse.py | ||
| parser.py | ||