certbot-apache 2.7.4__tar.gz → 2.9.0__tar.gz

{certbot-apache-2.7.4/certbot_apache.egg-info → certbot-apache-2.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: certbot-apache
-Version: 2.7.4
+Version: 2.9.0
 Summary: Apache plugin for Certbot
 Home-page: https://github.com/certbot/certbot
 Author: Certbot Project
@@ -13,18 +13,25 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Security
 Classifier: Topic :: System :: Installation/Setup
 Classifier: Topic :: System :: Networking
 Classifier: Topic :: System :: Systems Administration
 Classifier: Topic :: Utilities
-Requires-Python: >=3.7
+Requires-Python: >=3.8
+License-File: LICENSE.txt
+Requires-Dist: acme>=2.9.0
+Requires-Dist: certbot>=2.9.0
+Requires-Dist: importlib_resources>=1.3.1; python_version < "3.9"
+Requires-Dist: python-augeas
+Requires-Dist: setuptools>=41.6.0
 Provides-Extra: dev
+Requires-Dist: apacheconfig>=0.3.2; extra == "dev"
 Provides-Extra: test
-License-File: LICENSE.txt
+Requires-Dist: pytest; extra == "test"

{certbot-apache-2.7.4 → certbot-apache-2.9.0}/certbot_apache/_internal/apache_util.py

@@ -257,6 +257,6 @@ def find_ssl_apache_conf(prefix: str) -> str:
     """
     file_manager = ExitStack()
     atexit.register(file_manager.close)
-    ref = importlib_resources.files("certbot_apache").joinpath(
-        "_internal", "tls_configs", "{0}-options-ssl-apache.conf".format(prefix))
+    ref = (importlib_resources.files("certbot_apache").joinpath("_internal")
+           .joinpath("tls_configs").joinpath("{0}-options-ssl-apache.conf".format(prefix)))
     return str(file_manager.enter_context(importlib_resources.as_file(ref)))

{certbot-apache-2.7.4 → certbot-apache-2.9.0}/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,

certbot-apache-2.9.0/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",
+    )

{certbot-apache-2.7.4 → certbot-apache-2.9.0/certbot_apache.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: certbot-apache
-Version: 2.7.4
+Version: 2.9.0
 Summary: Apache plugin for Certbot
 Home-page: https://github.com/certbot/certbot
 Author: Certbot Project
@@ -13,18 +13,25 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Security
 Classifier: Topic :: System :: Installation/Setup
 Classifier: Topic :: System :: Networking
 Classifier: Topic :: System :: Systems Administration
 Classifier: Topic :: Utilities
-Requires-Python: >=3.7
+Requires-Python: >=3.8
+License-File: LICENSE.txt
+Requires-Dist: acme>=2.9.0
+Requires-Dist: certbot>=2.9.0
+Requires-Dist: importlib_resources>=1.3.1; python_version < "3.9"
+Requires-Dist: python-augeas
+Requires-Dist: setuptools>=41.6.0
 Provides-Extra: dev
+Requires-Dist: apacheconfig>=0.3.2; extra == "dev"
 Provides-Extra: test
-License-File: LICENSE.txt
+Requires-Dist: pytest; extra == "test"

{certbot-apache-2.7.4 → certbot-apache-2.9.0}/certbot_apache.egg-info/SOURCES.txt

@@ -23,6 +23,7 @@ certbot_apache/_internal/entrypoint.py
 certbot_apache/_internal/http_01.py
 certbot_apache/_internal/interfaces.py
 certbot_apache/_internal/obj.py
+certbot_apache/_internal/override_alpine.py
 certbot_apache/_internal/override_arch.py
 certbot_apache/_internal/override_centos.py
 certbot_apache/_internal/override_darwin.py

{certbot-apache-2.7.4 → certbot-apache-2.9.0}/certbot_apache.egg-info/requires.txt

@@ -1,5 +1,5 @@
-acme>=2.7.4
-certbot>=2.7.4
+acme>=2.9.0
+certbot>=2.9.0
 python-augeas
 setuptools>=41.6.0
 

{certbot-apache-2.7.4 → certbot-apache-2.9.0}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.7.4'
+version = '2.9.0'
 
 install_requires = [
     # We specify the minimum acme and certbot version as the current plugin
@@ -30,7 +30,7 @@ setup(
     author="Certbot Project",
     author_email='certbot-dev@eff.org',
     license='Apache License 2.0',
-    python_requires='>=3.7',
+    python_requires='>=3.8',
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Plugins',
@@ -39,11 +39,11 @@ setup(
         'Operating System :: POSIX :: Linux',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Security',
         'Topic :: System :: Installation/Setup',