certbot-apache 4.1.0__tar.gz → 4.2.0__tar.gz

{certbot_apache-4.1.0/src/certbot_apache.egg-info → certbot_apache-4.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: certbot-apache
-Version: 4.1.0
+Version: 4.2.0
 Summary: Apache plugin for Certbot
 Home-page: https://github.com/certbot/certbot
 Author: Certbot Project
@@ -26,8 +26,8 @@ Classifier: Topic :: System :: Systems Administration
 Classifier: Topic :: Utilities
 Requires-Python: >=3.9.2
 License-File: LICENSE.txt
-Requires-Dist: acme>=4.1.0
-Requires-Dist: certbot>=4.1.0
+Requires-Dist: acme>=4.2.0
+Requires-Dist: certbot>=4.2.0
 Requires-Dist: python-augeas
 Provides-Extra: dev
 Requires-Dist: apacheconfig>=0.3.2; extra == "dev"

{certbot_apache-4.1.0 → certbot_apache-4.2.0}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '4.1.0'
+version = '4.2.0'
 
 install_requires = [
     # We specify the minimum acme and certbot version as the current plugin

{certbot_apache-4.1.0 → certbot_apache-4.2.0}/src/certbot_apache/_internal/augeas_lens/httpd.aug

@@ -157,7 +157,7 @@ let argv (l:lens) = l . (sep_spc . l)*
  * not need to have space between them, but bare arguments do.
  *
  * Apache apparently is also happy if the last argument starts with a double
- * quote, but has no corresponding closing duoble quote, which is what
+ * quote, but has no corresponding closing double quote, which is what
  * arg_dir_msg handles
  *)
 let dir_args =

{certbot_apache-4.1.0 → certbot_apache-4.2.0}/src/certbot_apache/_internal/configurator.py

@@ -166,6 +166,10 @@ class ApacheConfigurator(common.Configurator):
         openssl_version = self.openssl_version(warn_on_no_mod_ssl)
         if self.version < (2, 4, 11) or not openssl_version or \
             util.parse_loose_version(openssl_version) < min_openssl_version:
+            logger.warning('Certbot has detected that apache version < 2.4.11 or compiled against '
+                'openssl < 1.0.2l. Since these are deprecated, the configuration file being '
+                'installed at %s will not receive future updates. To get the latest configuration '
+                'version, update apache.', self.mod_ssl_conf)
             return apache_util.find_ssl_apache_conf("old")
         return apache_util.find_ssl_apache_conf("current")
 

{certbot_apache-4.1.0 → certbot_apache-4.2.0}/src/certbot_apache/_internal/constants.py

@@ -34,6 +34,7 @@ ALL_SSL_OPTIONS_HASHES: List[str] = [
     '34783b9e2210f5c4a23bced2dfd7ec289834716673354ed7c7abf69fe30192a3',
     '61466bc2f98a623c02be8a5ee916ead1655b0ce883bdc936692076ea499ff5ce',
     '3fd812e3e87fe5c645d3682a511b2a06c8286f19594f28e280f17cd6af1301b5',
+    '27155797e160fe43b6951354a0a0ca4d829e9e605b3b41fc223c20bf2f6cb3c6',
 ]
 """SHA256 hashes of the contents of previous versions of all versions of MOD_SSL_CONF_SRC"""
 

{certbot_apache-4.1.0 → certbot_apache-4.2.0}/src/certbot_apache/_internal/parser.py

@@ -418,7 +418,7 @@ class ApacheParser:
     def add_dir(
         self, aug_conf_path: Optional[str], directive: Optional[str], args: Union[List[str], str]
     ) -> None:
-        """Appends directive to the end fo the file given by aug_conf_path.
+        """Appends directive to the end of the file given by aug_conf_path.
 
         .. note:: Not added to AugeasConfigurator because it may depend
             on the lens

{certbot_apache-4.1.0 → certbot_apache-4.2.0}/src/certbot_apache/_internal/tests/configurator_test.py

@@ -1091,7 +1091,7 @@ class MultipleVhostsTest(util.ApacheTest):
         # pylint: disable=protected-access
         http_vhost = self.config._get_http_vhost(ssl_vhost)
 
-        # Create an old (previously suppoorted) https redirectoin rewrite rule
+        # Create an old (previously supported) https redirectoin rewrite rule
         self.config.parser.add_dir(
             http_vhost.path, "RewriteRule",
             ["^",

{certbot_apache-4.1.0 → certbot_apache-4.2.0}/src/certbot_apache/_internal/tests/testdata/centos7_apache/apache/httpd/conf.d/ssl.conf

@@ -110,7 +110,7 @@ SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5:!SEED:!IDEA
 #   certificate chain for the server certificate. Alternatively
 #   the referenced file can be the same as SSLCertificateFile
 #   when the CA certificates are directly appended to the server
-#   certificate for convinience.
+#   certificate for convenience.
 #SSLCertificateChainFile /etc/pki/tls/certs/server-chain.crt
 
 #   Certificate Authority (CA):

{certbot_apache-4.1.0 → certbot_apache-4.2.0}/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/apache2/vhosts.d/00_default_ssl_vhost.conf

@@ -58,7 +58,7 @@ Listen 443
 	# PEM encoded CA certificates which form the certificate chain for the
 	# server certificate. Alternatively the referenced file can be the same as
 	# SSLCertificateFile when the CA certificates are directly appended to the
-	# server certificate for convinience.
+	# server certificate for convenience.
 	#SSLCertificateChainFile /etc/ssl/apache2/ca.crt
 
 	## Certificate Authority (CA):

{certbot_apache-4.1.0 → certbot_apache-4.2.0}/src/certbot_apache/_internal/tests/testdata/gentoo_apache/apache/conf.d/apache2

@@ -26,7 +26,7 @@
 #
 # The following two options provide the default virtual host for the HTTP and
 # HTTPS protocol. YOU NEED TO ENABLE AT LEAST ONE OF THEM, otherwise apache
-# will not listen for incomming connections on the approriate port.
+# will not listen for incoming connections on the appropriate port.
 #
 #  DEFAULT_VHOST      Enables name-based virtual hosts, with the default
 #                     virtual host being in /var/www/localhost/htdocs

{certbot_apache-4.1.0 → certbot_apache-4.2.0}/src/certbot_apache/_internal/tls_configs/old-options-ssl-apache.conf

@@ -3,6 +3,10 @@
 # updates. Instead, Certbot will print and log an error message with a path to
 # the up-to-date file that you will need to refer to when manually updating
 # this file. Contents are based on https://ssl-config.mozilla.org
+#
+# This file is installed when apache < 2.4.11 or compiled against openssl < 1.0.2l. Since these
+# are deprecated, it is no longer receiving updates. To get the latest configuration
+# version, update apache.
 
 SSLEngine on
 

{certbot_apache-4.1.0 → certbot_apache-4.2.0/src/certbot_apache.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: certbot-apache
-Version: 4.1.0
+Version: 4.2.0
 Summary: Apache plugin for Certbot
 Home-page: https://github.com/certbot/certbot
 Author: Certbot Project
@@ -26,8 +26,8 @@ Classifier: Topic :: System :: Systems Administration
 Classifier: Topic :: Utilities
 Requires-Python: >=3.9.2
 License-File: LICENSE.txt
-Requires-Dist: acme>=4.1.0
-Requires-Dist: certbot>=4.1.0
+Requires-Dist: acme>=4.2.0
+Requires-Dist: certbot>=4.2.0
 Requires-Dist: python-augeas
 Provides-Extra: dev
 Requires-Dist: apacheconfig>=0.3.2; extra == "dev"

{certbot_apache-4.1.0 → certbot_apache-4.2.0}/src/certbot_apache.egg-info/requires.txt

@@ -1,5 +1,5 @@
-acme>=4.1.0
-certbot>=4.1.0
+acme>=4.2.0
+certbot>=4.2.0
 python-augeas
 
 [dev]