diff --git a/AUTHORS.md b/AUTHORS.md index f3dca7c69..d08b0b79f 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -94,6 +94,7 @@ Authors * [Felix Yan](https://github.com/felixonmars) * [Filip Ochnik](https://github.com/filipochnik) * [Florian Klink](https://github.com/flokli) +* [Francesco Colista](https://github.com/fcolista) * [Francois Marier](https://github.com/fmarier) * [Frank](https://github.com/Frankkkkk) * [Frederic BLANC](https://github.com/fblanc) diff --git a/certbot-apache/certbot_apache/_internal/entrypoint.py b/certbot-apache/certbot_apache/_internal/entrypoint.py index c4714b382..d109e8997 100644 --- a/certbot-apache/certbot_apache/_internal/entrypoint.py +++ b/certbot-apache/certbot_apache/_internal/entrypoint.py @@ -4,6 +4,7 @@ from typing import Type from certbot import util from certbot_apache._internal import configurator +from certbot_apache._internal import override_alpine from certbot_apache._internal import override_arch from certbot_apache._internal import override_centos from certbot_apache._internal import override_darwin @@ -14,6 +15,7 @@ from certbot_apache._internal import override_suse from certbot_apache._internal import override_void OVERRIDE_CLASSES: Dict[str, Type[configurator.ApacheConfigurator]] = { + "alpine": override_alpine.AlpineConfigurator, "arch": override_arch.ArchConfigurator, "cloudlinux": override_centos.CentOSConfigurator, "darwin": override_darwin.DarwinConfigurator, diff --git a/certbot-apache/certbot_apache/_internal/override_alpine.py b/certbot-apache/certbot_apache/_internal/override_alpine.py new file mode 100644 index 000000000..b3ea041df --- /dev/null +++ b/certbot-apache/certbot_apache/_internal/override_alpine.py @@ -0,0 +1,19 @@ +""" Distribution specific override class for Alpine Linux """ +from certbot_apache._internal import configurator +from certbot_apache._internal.configurator import OsOptions + + +class AlpineConfigurator(configurator.ApacheConfigurator): + """Alpine Linux specific ApacheConfigurator override class""" + + OS_DEFAULTS = OsOptions( + server_root="/etc/apache2", + vhost_root="/etc/apache2/conf.d", + vhost_files="*.conf", + logs_root="/var/log/apache2", + ctl="apachectl", + version_cmd=['apachectl', '-v'], + restart_cmd=['apachectl', 'graceful'], + conftest_cmd=['apachectl', 'configtest'], + challenge_location="/etc/apache2/conf.d", + ) diff --git a/certbot/CHANGELOG.md b/certbot/CHANGELOG.md index 7c6568efa..cea715277 100644 --- a/certbot/CHANGELOG.md +++ b/certbot/CHANGELOG.md @@ -6,7 +6,7 @@ Certbot adheres to [Semantic Versioning](https://semver.org/). ### Added -* +* Added support for [Alpine Linux](https://www.alpinelinux.org) distribution when is used the apache plugin ### Changed