Make apache tests internal (#9637)

This is the certbot-apache version of #9625.
certbot · Mar 28, 2023 · ed6bbde · ed6bbde
1 parent 16cc1a7
commit ed6bbde
Show file tree

Hide file tree

Showing 195 changed files with 19 additions and 17 deletions.
diff --git a/certbot-apache/MANIFEST.in b/certbot-apache/MANIFEST.in
@@ -1,8 +1,8 @@
 include LICENSE.txt
 include README.rst
-recursive-include tests *
 recursive-include certbot_apache/_internal/augeas_lens *.aug
 recursive-include certbot_apache/_internal/tls_configs *.conf
+recursive-include certbot_apache/_internal/tests/testdata *
 include certbot_apache/py.typed
 global-exclude __pycache__
 global-exclude *.py[cod]
diff --git a/certbot-apache/certbot_apache/_internal/tests/__init__.py b/certbot-apache/certbot_apache/_internal/tests/__init__.py
@@ -0,0 +1 @@
+"""certbot-apache tests"""
diff --git a/...apache/tests/apache-conf-files/NEEDED.txt → ...ternal/tests/apache-conf-files/NEEDED.txt b/...apache/tests/apache-conf-files/NEEDED.txt → ...ternal/tests/apache-conf-files/NEEDED.txt
diff --git a/.../tests/apache-conf-files/apache-conf-test → .../tests/apache-conf-files/apache-conf-test b/.../tests/apache-conf-files/apache-conf-test → .../tests/apache-conf-files/apache-conf-test
diff --git a/...che-conf-files/apache-conf-test-pebble.py → ...che-conf-files/apache-conf-test-pebble.py b/...che-conf-files/apache-conf-test-pebble.py → ...che-conf-files/apache-conf-test-pebble.py
diff --git a/...es/failing/missing-double-quote-1724.conf → ...es/failing/missing-double-quote-1724.conf b/...es/failing/missing-double-quote-1724.conf → ...es/failing/missing-double-quote-1724.conf
diff --git a/...e-conf-files/failing/multivhost-1093.conf → ...e-conf-files/failing/multivhost-1093.conf b/...e-conf-files/failing/multivhost-1093.conf → ...e-conf-files/failing/multivhost-1093.conf
diff --git a/...-conf-files/failing/multivhost-1093b.conf → ...-conf-files/failing/multivhost-1093b.conf b/...-conf-files/failing/multivhost-1093b.conf → ...-conf-files/failing/multivhost-1093b.conf
diff --git a/.../apache-conf-files/passing/1626-1531.conf → .../apache-conf-files/passing/1626-1531.conf b/.../apache-conf-files/passing/1626-1531.conf → .../apache-conf-files/passing/1626-1531.conf
diff --git a/.../apache-conf-files/passing/README.modules → .../apache-conf-files/passing/README.modules b/.../apache-conf-files/passing/README.modules → .../apache-conf-files/passing/README.modules
diff --git a/...ache-conf-files/passing/anarcat-1531.conf → ...ache-conf-files/passing/anarcat-1531.conf b/...ache-conf-files/passing/anarcat-1531.conf → ...ache-conf-files/passing/anarcat-1531.conf
diff --git a/...s/passing/comment-continuations-2050.conf → ...s/passing/comment-continuations-2050.conf b/...s/passing/comment-continuations-2050.conf → ...s/passing/comment-continuations-2050.conf
diff --git a/...assing/drupal-errordocument-arg-1724.conf → ...assing/drupal-errordocument-arg-1724.conf b/...assing/drupal-errordocument-arg-1724.conf → ...assing/drupal-errordocument-arg-1724.conf
diff --git a/...f-files/passing/drupal-htaccess-1531.conf → ...f-files/passing/drupal-htaccess-1531.conf b/...f-files/passing/drupal-htaccess-1531.conf → ...f-files/passing/drupal-htaccess-1531.conf
diff --git a/...passing/escaped-space-arguments-2735.conf → ...passing/escaped-space-arguments-2735.conf b/...passing/escaped-space-arguments-2735.conf → ...passing/escaped-space-arguments-2735.conf
diff --git a/...ache-conf-files/passing/example-1755.conf → ...ache-conf-files/passing/example-1755.conf b/...ache-conf-files/passing/example-1755.conf → ...ache-conf-files/passing/example-1755.conf
diff --git a/...pache-conf-files/passing/example-ssl.conf → ...pache-conf-files/passing/example-ssl.conf b/...pache-conf-files/passing/example-ssl.conf → ...pache-conf-files/passing/example-ssl.conf
diff --git a/...ts/apache-conf-files/passing/example.conf → ...ts/apache-conf-files/passing/example.conf b/...ts/apache-conf-files/passing/example.conf → ...ts/apache-conf-files/passing/example.conf
diff --git a/...es/passing/finalize-1243.apache2.conf.txt → ...es/passing/finalize-1243.apache2.conf.txt b/...es/passing/finalize-1243.apache2.conf.txt → ...es/passing/finalize-1243.apache2.conf.txt
diff --git a/...che-conf-files/passing/finalize-1243.conf → ...che-conf-files/passing/finalize-1243.conf b/...che-conf-files/passing/finalize-1243.conf → ...che-conf-files/passing/finalize-1243.conf
diff --git a/...nf-files/passing/graphite-quote-1934.conf → ...nf-files/passing/graphite-quote-1934.conf b/...nf-files/passing/graphite-quote-1934.conf → ...nf-files/passing/graphite-quote-1934.conf
diff --git a/.../apache-conf-files/passing/ipv6-1143.conf → .../apache-conf-files/passing/ipv6-1143.conf b/.../apache-conf-files/passing/ipv6-1143.conf → .../apache-conf-files/passing/ipv6-1143.conf
diff --git a/...apache-conf-files/passing/ipv6-1143b.conf → ...apache-conf-files/passing/ipv6-1143b.conf b/...apache-conf-files/passing/ipv6-1143b.conf → ...apache-conf-files/passing/ipv6-1143b.conf
diff --git a/...apache-conf-files/passing/ipv6-1143c.conf → ...apache-conf-files/passing/ipv6-1143c.conf b/...apache-conf-files/passing/ipv6-1143c.conf → ...apache-conf-files/passing/ipv6-1143c.conf
diff --git a/...apache-conf-files/passing/ipv6-1143d.conf → ...apache-conf-files/passing/ipv6-1143d.conf b/...apache-conf-files/passing/ipv6-1143d.conf → ...apache-conf-files/passing/ipv6-1143d.conf
diff --git a/...onf-files/passing/missing-quote-1724.conf → ...onf-files/passing/missing-quote-1724.conf b/...onf-files/passing/missing-quote-1724.conf → ...onf-files/passing/missing-quote-1724.conf
diff --git a/...che-conf-files/passing/modmacro-1385.conf → ...che-conf-files/passing/modmacro-1385.conf b/...che-conf-files/passing/modmacro-1385.conf → ...che-conf-files/passing/modmacro-1385.conf
diff --git a/...che-conf-files/passing/owncloud-1264.conf → ...che-conf-files/passing/owncloud-1264.conf b/...che-conf-files/passing/owncloud-1264.conf → ...che-conf-files/passing/owncloud-1264.conf
diff --git a/...onf-files/passing/rewrite-quote-1960.conf → ...onf-files/passing/rewrite-quote-1960.conf b/...onf-files/passing/rewrite-quote-1960.conf → ...onf-files/passing/rewrite-quote-1960.conf
diff --git a/...he-conf-files/passing/roundcube-1222.conf → ...he-conf-files/passing/roundcube-1222.conf b/...he-conf-files/passing/roundcube-1222.conf → ...he-conf-files/passing/roundcube-1222.conf
diff --git a/...s/passing/section-continuations-2525.conf → ...s/passing/section-continuations-2525.conf b/...s/passing/section-continuations-2525.conf → ...s/passing/section-continuations-2525.conf
diff --git a/...ing/section-empty-continuations-2731.conf → ...ing/section-empty-continuations-2731.conf b/...ing/section-empty-continuations-2731.conf → ...ing/section-empty-continuations-2731.conf
diff --git a/...che-conf-files/passing/semacode-1598.conf → ...che-conf-files/passing/semacode-1598.conf b/...che-conf-files/passing/semacode-1598.conf → ...che-conf-files/passing/semacode-1598.conf
diff --git a/...passing/sslrequire-wordlist-1827.htaccess → ...passing/sslrequire-wordlist-1827.htaccess b/...passing/sslrequire-wordlist-1827.htaccess → ...passing/sslrequire-wordlist-1827.htaccess
diff --git a/...les/passing/two-blocks-one-line-1693.conf → ...les/passing/two-blocks-one-line-1693.conf b/...les/passing/two-blocks-one-line-1693.conf → ...les/passing/two-blocks-one-line-1693.conf
diff --git a/certbot-apache/tests/augeasnode_test.py → ...apache/_internal/tests/augeasnode_test.py b/certbot-apache/tests/augeasnode_test.py → ...apache/_internal/tests/augeasnode_test.py
@@ -3,11 +3,12 @@
 from typing import List
 from unittest import mock
 
+import pytest
+
 from certbot import errors
 from certbot_apache._internal import assertions
 from certbot_apache._internal import augeasparser
-import util
-import pytest
+from certbot_apache._internal.tests import util
 
 
 def _get_augeasnode_mock(filepath):

diff --git a/certbot-apache/tests/autohsts_test.py → ...t_apache/_internal/tests/autohsts_test.py b/certbot-apache/tests/autohsts_test.py → ...t_apache/_internal/tests/autohsts_test.py
@@ -9,7 +9,7 @@
 
 from certbot import errors
 from certbot_apache._internal import constants
-import util
+from certbot_apache._internal.tests import util
 
 
 class AutoHSTSTest(util.ApacheTest):

diff --git a/certbot-apache/tests/centos_test.py → ...bot_apache/_internal/tests/centos_test.py b/certbot-apache/tests/centos_test.py → ...bot_apache/_internal/tests/centos_test.py
@@ -10,7 +10,7 @@
 from certbot.compat import os
 from certbot_apache._internal import obj
 from certbot_apache._internal import override_centos
-import util
+from certbot_apache._internal.tests import util
 
 
 def get_vh_truth(temp_dir, config_name):

diff --git a/certbot-apache/tests/complex_parsing_test.py → ...e/_internal/tests/complex_parsing_test.py b/certbot-apache/tests/complex_parsing_test.py → ...e/_internal/tests/complex_parsing_test.py
@@ -7,7 +7,7 @@
 
 from certbot import errors
 from certbot.compat import os
-import util
+from certbot_apache._internal.tests import util
 
 
 class ComplexParserTest(util.ParserTest):

diff --git a/...pache/tests/configurator_reverter_test.py → ...ernal/tests/configurator_reverter_test.py b/...pache/tests/configurator_reverter_test.py → ...ernal/tests/configurator_reverter_test.py
@@ -7,7 +7,7 @@
 import pytest
 
 from certbot import errors
-import util
+from certbot_apache._internal.tests import util
 
 
 class ConfiguratorReverterTest(util.ApacheTest):

diff --git a/certbot-apache/tests/configurator_test.py → ...ache/_internal/tests/configurator_test.py b/certbot-apache/tests/configurator_test.py → ...ache/_internal/tests/configurator_test.py
@@ -22,7 +22,7 @@
 from certbot_apache._internal import constants
 from certbot_apache._internal import obj
 from certbot_apache._internal import parser
-import util
+from certbot_apache._internal.tests import util
 
 
 class MultipleVhostsTest(util.ApacheTest):

diff --git a/certbot-apache/tests/debian_test.py → ...bot_apache/_internal/tests/debian_test.py b/certbot-apache/tests/debian_test.py → ...bot_apache/_internal/tests/debian_test.py
@@ -11,7 +11,7 @@
 from certbot.tests import util as certbot_util
 from certbot_apache._internal import apache_util
 from certbot_apache._internal import obj
-import util
+from certbot_apache._internal.tests import util
 
 
 class MultipleVhostsTestDebian(util.ApacheTest):

diff --git a/certbot-apache/tests/display_ops_test.py → ...pache/_internal/tests/display_ops_test.py b/certbot-apache/tests/display_ops_test.py → ...pache/_internal/tests/display_ops_test.py
@@ -10,7 +10,7 @@
 from certbot.tests import util as certbot_util
 from certbot_apache._internal import obj
 from certbot_apache._internal.display_ops import select_vhost_multiple
-import util
+from certbot_apache._internal.tests import util
 
 
 class SelectVhostMultiTest(unittest.TestCase):

diff --git a/certbot-apache/tests/dualnode_test.py → ...t_apache/_internal/tests/dualnode_test.py b/certbot-apache/tests/dualnode_test.py → ...t_apache/_internal/tests/dualnode_test.py
diff --git a/certbot-apache/tests/entrypoint_test.py → ...apache/_internal/tests/entrypoint_test.py b/certbot-apache/tests/entrypoint_test.py → ...apache/_internal/tests/entrypoint_test.py
diff --git a/certbot-apache/tests/fedora_test.py → ...bot_apache/_internal/tests/fedora_test.py b/certbot-apache/tests/fedora_test.py → ...bot_apache/_internal/tests/fedora_test.py
@@ -10,7 +10,7 @@
 from certbot.compat import os
 from certbot_apache._internal import obj
 from certbot_apache._internal import override_fedora
-import util
+from certbot_apache._internal.tests import util
 
 
 def get_vh_truth(temp_dir, config_name):

diff --git a/certbot-apache/tests/gentoo_test.py → ...bot_apache/_internal/tests/gentoo_test.py b/certbot-apache/tests/gentoo_test.py → ...bot_apache/_internal/tests/gentoo_test.py
@@ -10,7 +10,7 @@
 from certbot.compat import os
 from certbot_apache._internal import obj
 from certbot_apache._internal import override_gentoo
-import util
+from certbot_apache._internal.tests import util
 
 
 def get_vh_truth(temp_dir, config_name):

diff --git a/certbot-apache/tests/http_01_test.py → ...ot_apache/_internal/tests/http_01_test.py b/certbot-apache/tests/http_01_test.py → ...ot_apache/_internal/tests/http_01_test.py
@@ -14,7 +14,7 @@
 from certbot.compat import os
 from certbot.tests import acme_util
 from certbot_apache._internal.parser import get_aug_path
-import util
+from certbot_apache._internal.tests import util
 
 NUM_ACHALLS = 3
 

diff --git a/certbot-apache/tests/obj_test.py → ...ertbot_apache/_internal/tests/obj_test.py b/certbot-apache/tests/obj_test.py → ...ertbot_apache/_internal/tests/obj_test.py
diff --git a/certbot-apache/tests/parser_test.py → ...bot_apache/_internal/tests/parser_test.py b/certbot-apache/tests/parser_test.py → ...bot_apache/_internal/tests/parser_test.py
@@ -8,7 +8,7 @@
 
 from certbot import errors
 from certbot.compat import os
-import util
+from certbot_apache._internal.tests import util
 
 
 class BasicParserTest(util.ParserTest):

diff --git a/...che/tests/parsernode_configurator_test.py → ...nal/tests/parsernode_configurator_test.py b/...che/tests/parsernode_configurator_test.py → ...nal/tests/parsernode_configurator_test.py
@@ -5,7 +5,7 @@
 
 import pytest
 
-import util
+from certbot_apache._internal.tests import util
 
 try:
     import apacheconfig

diff --git a/certbot-apache/tests/parsernode_test.py → ...apache/_internal/tests/parsernode_test.py b/certbot-apache/tests/parsernode_test.py → ...apache/_internal/tests/parsernode_test.py
diff --git a/certbot-apache/tests/parsernode_util_test.py → ...e/_internal/tests/parsernode_util_test.py b/certbot-apache/tests/parsernode_util_test.py → ...e/_internal/tests/parsernode_util_test.py
diff --git a/...centos7_apache/apache/httpd/conf.d/README → ...centos7_apache/apache/httpd/conf.d/README b/...centos7_apache/apache/httpd/conf.d/README → ...centos7_apache/apache/httpd/conf.d/README
diff --git a/...apache/apache/httpd/conf.d/autoindex.conf → ...apache/apache/httpd/conf.d/autoindex.conf b/...apache/apache/httpd/conf.d/autoindex.conf → ...apache/apache/httpd/conf.d/autoindex.conf
diff --git a/...ache/httpd/conf.d/centos.example.com.conf → ...ache/httpd/conf.d/centos.example.com.conf b/...ache/httpd/conf.d/centos.example.com.conf → ...ache/httpd/conf.d/centos.example.com.conf
diff --git a/...ntos7_apache/apache/httpd/conf.d/ssl.conf → ...ntos7_apache/apache/httpd/conf.d/ssl.conf b/...ntos7_apache/apache/httpd/conf.d/ssl.conf → ...ntos7_apache/apache/httpd/conf.d/ssl.conf
diff --git a/...7_apache/apache/httpd/conf.d/userdir.conf → ...7_apache/apache/httpd/conf.d/userdir.conf b/...7_apache/apache/httpd/conf.d/userdir.conf → ...7_apache/apache/httpd/conf.d/userdir.conf
diff --git a/...7_apache/apache/httpd/conf.d/welcome.conf → ...7_apache/apache/httpd/conf.d/welcome.conf b/...7_apache/apache/httpd/conf.d/welcome.conf → ...7_apache/apache/httpd/conf.d/welcome.conf
diff --git a/.../apache/httpd/conf.modules.d/00-base.conf → .../apache/httpd/conf.modules.d/00-base.conf b/.../apache/httpd/conf.modules.d/00-base.conf → .../apache/httpd/conf.modules.d/00-base.conf
diff --git a/...e/apache/httpd/conf.modules.d/00-dav.conf → ...e/apache/httpd/conf.modules.d/00-dav.conf b/...e/apache/httpd/conf.modules.d/00-dav.conf → ...e/apache/httpd/conf.modules.d/00-dav.conf
diff --git a/...e/apache/httpd/conf.modules.d/00-lua.conf → ...e/apache/httpd/conf.modules.d/00-lua.conf b/...e/apache/httpd/conf.modules.d/00-lua.conf → ...e/apache/httpd/conf.modules.d/00-lua.conf
diff --git a/...e/apache/httpd/conf.modules.d/00-mpm.conf → ...e/apache/httpd/conf.modules.d/00-mpm.conf b/...e/apache/httpd/conf.modules.d/00-mpm.conf → ...e/apache/httpd/conf.modules.d/00-mpm.conf
diff --git a/...apache/httpd/conf.modules.d/00-proxy.conf → ...apache/httpd/conf.modules.d/00-proxy.conf b/...apache/httpd/conf.modules.d/00-proxy.conf → ...apache/httpd/conf.modules.d/00-proxy.conf
diff --git a/...e/apache/httpd/conf.modules.d/00-ssl.conf → ...e/apache/httpd/conf.modules.d/00-ssl.conf b/...e/apache/httpd/conf.modules.d/00-ssl.conf → ...e/apache/httpd/conf.modules.d/00-ssl.conf
diff --git a/...ache/httpd/conf.modules.d/00-systemd.conf → ...ache/httpd/conf.modules.d/00-systemd.conf b/...ache/httpd/conf.modules.d/00-systemd.conf → ...ache/httpd/conf.modules.d/00-systemd.conf
diff --git a/...e/apache/httpd/conf.modules.d/01-cgi.conf → ...e/apache/httpd/conf.modules.d/01-cgi.conf b/...e/apache/httpd/conf.modules.d/01-cgi.conf → ...e/apache/httpd/conf.modules.d/01-cgi.conf
diff --git a/...ntos7_apache/apache/httpd/conf/httpd.conf → ...ntos7_apache/apache/httpd/conf/httpd.conf b/...ntos7_apache/apache/httpd/conf/httpd.conf → ...ntos7_apache/apache/httpd/conf/httpd.conf
diff --git a/...ta/centos7_apache/apache/httpd/conf/magic → ...ta/centos7_apache/apache/httpd/conf/magic b/...ta/centos7_apache/apache/httpd/conf/magic → ...ta/centos7_apache/apache/httpd/conf/magic
diff --git a/...ests/testdata/centos7_apache/apache/sites → ...ests/testdata/centos7_apache/apache/sites b/...ests/testdata/centos7_apache/apache/sites → ...ests/testdata/centos7_apache/apache/sites
diff --git a/...ata/centos7_apache/apache/sysconfig/httpd → ...ata/centos7_apache/apache/sysconfig/httpd b/...ata/centos7_apache/apache/sysconfig/httpd → ...ata/centos7_apache/apache/sysconfig/httpd
diff --git a/...sts/testdata/complex_parsing/apache2.conf → ...sts/testdata/complex_parsing/apache2.conf b/...sts/testdata/complex_parsing/apache2.conf → ...sts/testdata/complex_parsing/apache2.conf
diff --git a/...a/complex_parsing/conf-enabled/dummy.conf → ...a/complex_parsing/conf-enabled/dummy.conf b/...a/complex_parsing/conf-enabled/dummy.conf → ...a/complex_parsing/conf-enabled/dummy.conf
diff --git a/...estdata/complex_parsing/test_fnmatch.conf → ...estdata/complex_parsing/test_fnmatch.conf b/...estdata/complex_parsing/test_fnmatch.conf → ...estdata/complex_parsing/test_fnmatch.conf
diff --git a/...tdata/complex_parsing/test_variables.conf → ...tdata/complex_parsing/test_variables.conf b/...tdata/complex_parsing/test_variables.conf → ...tdata/complex_parsing/test_variables.conf
diff --git a/...he_2_4/augeas_vhosts/apache2/apache2.conf → ...he_2_4/augeas_vhosts/apache2/apache2.conf b/...he_2_4/augeas_vhosts/apache2/apache2.conf → ...he_2_4/augeas_vhosts/apache2/apache2.conf
diff --git a/...apache2/conf-available/bad_conf_file.conf → ...apache2/conf-available/bad_conf_file.conf b/...apache2/conf-available/bad_conf_file.conf → ...apache2/conf-available/bad_conf_file.conf
diff --git a/...nf-available/other-vhosts-access-log.conf → ...nf-available/other-vhosts-access-log.conf b/...nf-available/other-vhosts-access-log.conf → ...nf-available/other-vhosts-access-log.conf
diff --git a/...osts/apache2/conf-available/security.conf → ...osts/apache2/conf-available/security.conf b/...osts/apache2/conf-available/security.conf → ...osts/apache2/conf-available/security.conf
diff --git a/...apache2/conf-available/serve-cgi-bin.conf → ...apache2/conf-available/serve-cgi-bin.conf b/...apache2/conf-available/serve-cgi-bin.conf → ...apache2/conf-available/serve-cgi-bin.conf
diff --git a/...conf-enabled/other-vhosts-access-log.conf → ...conf-enabled/other-vhosts-access-log.conf b/...conf-enabled/other-vhosts-access-log.conf → ...conf-enabled/other-vhosts-access-log.conf
diff --git a/...vhosts/apache2/conf-enabled/security.conf → ...vhosts/apache2/conf-enabled/security.conf b/...vhosts/apache2/conf-enabled/security.conf → ...vhosts/apache2/conf-enabled/security.conf
diff --git a/...s/apache2/conf-enabled/serve-cgi-bin.conf → ...s/apache2/conf-enabled/serve-cgi-bin.conf b/...s/apache2/conf-enabled/serve-cgi-bin.conf → ...s/apache2/conf-enabled/serve-cgi-bin.conf
diff --git a/..._apache_2_4/augeas_vhosts/apache2/envvars → ..._apache_2_4/augeas_vhosts/apache2/envvars b/..._apache_2_4/augeas_vhosts/apache2/envvars → ..._apache_2_4/augeas_vhosts/apache2/envvars
diff --git a/...sts/apache2/mods-available/authz_svn.load → ...sts/apache2/mods-available/authz_svn.load b/...sts/apache2/mods-available/authz_svn.load → ...sts/apache2/mods-available/authz_svn.load
diff --git a/...as_vhosts/apache2/mods-available/dav.load → ...as_vhosts/apache2/mods-available/dav.load b/...as_vhosts/apache2/mods-available/dav.load → ...as_vhosts/apache2/mods-available/dav.load
diff --git a/...hosts/apache2/mods-available/dav_svn.conf → ...hosts/apache2/mods-available/dav_svn.conf b/...hosts/apache2/mods-available/dav_svn.conf → ...hosts/apache2/mods-available/dav_svn.conf
diff --git a/...hosts/apache2/mods-available/dav_svn.load → ...hosts/apache2/mods-available/dav_svn.load b/...hosts/apache2/mods-available/dav_svn.load → ...hosts/apache2/mods-available/dav_svn.load
diff --git a/...hosts/apache2/mods-available/rewrite.load → ...hosts/apache2/mods-available/rewrite.load b/...hosts/apache2/mods-available/rewrite.load → ...hosts/apache2/mods-available/rewrite.load
diff --git a/...as_vhosts/apache2/mods-available/ssl.conf → ...as_vhosts/apache2/mods-available/ssl.conf b/...as_vhosts/apache2/mods-available/ssl.conf → ...as_vhosts/apache2/mods-available/ssl.conf
diff --git a/...as_vhosts/apache2/mods-available/ssl.load → ...as_vhosts/apache2/mods-available/ssl.load b/...as_vhosts/apache2/mods-available/ssl.load → ...as_vhosts/apache2/mods-available/ssl.load
diff --git a/...hosts/apache2/mods-enabled/authz_svn.load → ...hosts/apache2/mods-enabled/authz_svn.load b/...hosts/apache2/mods-enabled/authz_svn.load → ...hosts/apache2/mods-enabled/authz_svn.load
diff --git a/...geas_vhosts/apache2/mods-enabled/dav.load → ...geas_vhosts/apache2/mods-enabled/dav.load b/...geas_vhosts/apache2/mods-enabled/dav.load → ...geas_vhosts/apache2/mods-enabled/dav.load
diff --git a/..._vhosts/apache2/mods-enabled/dav_svn.conf → ..._vhosts/apache2/mods-enabled/dav_svn.conf b/..._vhosts/apache2/mods-enabled/dav_svn.conf → ..._vhosts/apache2/mods-enabled/dav_svn.conf
diff --git a/..._vhosts/apache2/mods-enabled/dav_svn.load → ..._vhosts/apache2/mods-enabled/dav_svn.load b/..._vhosts/apache2/mods-enabled/dav_svn.load → ..._vhosts/apache2/mods-enabled/dav_svn.load
diff --git a/...ache_2_4/augeas_vhosts/apache2/ports.conf → ...ache_2_4/augeas_vhosts/apache2/ports.conf b/...ache_2_4/augeas_vhosts/apache2/ports.conf → ...ache_2_4/augeas_vhosts/apache2/ports.conf
diff --git a/...he2/sites-available/another_wildcard.conf → ...he2/sites-available/another_wildcard.conf b/...he2/sites-available/another_wildcard.conf → ...he2/sites-available/another_wildcard.conf
diff --git a/...che2/sites-available/old-and-default.conf → ...che2/sites-available/old-and-default.conf b/...che2/sites-available/old-and-default.conf → ...che2/sites-available/old-and-default.conf
diff --git a/...sts/apache2/sites-available/wildcard.conf → ...sts/apache2/sites-available/wildcard.conf b/...sts/apache2/sites-available/wildcard.conf → ...sts/apache2/sites-available/wildcard.conf
diff --git a/...ache2/sites-enabled/another_wildcard.conf → ...ache2/sites-enabled/another_wildcard.conf b/...ache2/sites-enabled/another_wildcard.conf → ...ache2/sites-enabled/another_wildcard.conf
diff --git a/...pache2/sites-enabled/old-and-default.conf → ...pache2/sites-enabled/old-and-default.conf b/...pache2/sites-enabled/old-and-default.conf → ...pache2/sites-enabled/old-and-default.conf
diff --git a/...hosts/apache2/sites-enabled/wildcard.conf → ...hosts/apache2/sites-enabled/wildcard.conf b/...hosts/apache2/sites-enabled/wildcard.conf → ...hosts/apache2/sites-enabled/wildcard.conf
diff --git a/...ata/debian_apache_2_4/augeas_vhosts/sites → ...ata/debian_apache_2_4/augeas_vhosts/sites b/...ata/debian_apache_2_4/augeas_vhosts/sites → ...ata/debian_apache_2_4/augeas_vhosts/sites
diff --git a/...he_2_4/default_vhost/apache2/apache2.conf → ...he_2_4/default_vhost/apache2/apache2.conf b/...he_2_4/default_vhost/apache2/apache2.conf → ...he_2_4/default_vhost/apache2/apache2.conf
diff --git a/...nf-available/other-vhosts-access-log.conf → ...nf-available/other-vhosts-access-log.conf b/...nf-available/other-vhosts-access-log.conf → ...nf-available/other-vhosts-access-log.conf
diff --git a/...host/apache2/conf-available/security.conf → ...host/apache2/conf-available/security.conf b/...host/apache2/conf-available/security.conf → ...host/apache2/conf-available/security.conf
diff --git a/...apache2/conf-available/serve-cgi-bin.conf → ...apache2/conf-available/serve-cgi-bin.conf b/...apache2/conf-available/serve-cgi-bin.conf → ...apache2/conf-available/serve-cgi-bin.conf
diff --git a/...conf-enabled/other-vhosts-access-log.conf → ...conf-enabled/other-vhosts-access-log.conf b/...conf-enabled/other-vhosts-access-log.conf → ...conf-enabled/other-vhosts-access-log.conf
diff --git a/..._vhost/apache2/conf-enabled/security.conf → ..._vhost/apache2/conf-enabled/security.conf b/..._vhost/apache2/conf-enabled/security.conf → ..._vhost/apache2/conf-enabled/security.conf
diff --git a/...t/apache2/conf-enabled/serve-cgi-bin.conf → ...t/apache2/conf-enabled/serve-cgi-bin.conf b/...t/apache2/conf-enabled/serve-cgi-bin.conf → ...t/apache2/conf-enabled/serve-cgi-bin.conf
diff --git a/..._apache_2_4/default_vhost/apache2/envvars → ..._apache_2_4/default_vhost/apache2/envvars b/..._apache_2_4/default_vhost/apache2/envvars → ..._apache_2_4/default_vhost/apache2/envvars
diff --git a/...ult_vhost/apache2/mods-available/ssl.conf → ...ult_vhost/apache2/mods-available/ssl.conf b/...ult_vhost/apache2/mods-available/ssl.conf → ...ult_vhost/apache2/mods-available/ssl.conf
diff --git a/...ult_vhost/apache2/mods-available/ssl.load → ...ult_vhost/apache2/mods-available/ssl.load b/...ult_vhost/apache2/mods-available/ssl.load → ...ult_vhost/apache2/mods-available/ssl.load
diff --git a/...ache_2_4/default_vhost/apache2/ports.conf → ...ache_2_4/default_vhost/apache2/ports.conf b/...ache_2_4/default_vhost/apache2/ports.conf → ...ache_2_4/default_vhost/apache2/ports.conf
diff --git a/.../apache2/sites-available/000-default.conf → .../apache2/sites-available/000-default.conf b/.../apache2/sites-available/000-default.conf → .../apache2/sites-available/000-default.conf
diff --git a/.../apache2/sites-available/default-ssl.conf → .../apache2/sites-available/default-ssl.conf b/.../apache2/sites-available/default-ssl.conf → .../apache2/sites-available/default-ssl.conf
diff --git a/...st/apache2/sites-enabled/000-default.conf → ...st/apache2/sites-enabled/000-default.conf b/...st/apache2/sites-enabled/000-default.conf → ...st/apache2/sites-enabled/000-default.conf
diff --git a/...ata/debian_apache_2_4/default_vhost/sites → ...ata/debian_apache_2_4/default_vhost/sites b/...ata/debian_apache_2_4/default_vhost/sites → ...ata/debian_apache_2_4/default_vhost/sites
diff --git a/...che_2_4/multi_vhosts/apache2/apache2.conf → ...che_2_4/multi_vhosts/apache2/apache2.conf b/...che_2_4/multi_vhosts/apache2/apache2.conf → ...che_2_4/multi_vhosts/apache2/apache2.conf
diff --git a/...n_apache_2_4/multi_vhosts/apache2/envvars → ...n_apache_2_4/multi_vhosts/apache2/envvars b/...n_apache_2_4/multi_vhosts/apache2/envvars → ...n_apache_2_4/multi_vhosts/apache2/envvars
diff --git a/...pache_2_4/multi_vhosts/apache2/ports.conf → ...pache_2_4/multi_vhosts/apache2/ports.conf b/...pache_2_4/multi_vhosts/apache2/ports.conf → ...pache_2_4/multi_vhosts/apache2/ports.conf
diff --git a/...osts/apache2/sites-available/default.conf → ...osts/apache2/sites-available/default.conf b/...osts/apache2/sites-available/default.conf → ...osts/apache2/sites-available/default.conf
diff --git a/.../apache2/sites-available/multi-vhost.conf → .../apache2/sites-available/multi-vhost.conf b/.../apache2/sites-available/multi-vhost.conf → .../apache2/sites-available/multi-vhost.conf
diff --git a/...vhosts/apache2/sites-enabled/default.conf → ...vhosts/apache2/sites-enabled/default.conf b/...vhosts/apache2/sites-enabled/default.conf → ...vhosts/apache2/sites-enabled/default.conf
diff --git a/...ts/apache2/sites-enabled/multi-vhost.conf → ...ts/apache2/sites-enabled/multi-vhost.conf b/...ts/apache2/sites-enabled/multi-vhost.conf → ...ts/apache2/sites-enabled/multi-vhost.conf
diff --git a/..._2_4/multiple_vhosts/apache2/apache2.conf → ..._2_4/multiple_vhosts/apache2/apache2.conf b/..._2_4/multiple_vhosts/apache2/apache2.conf → ..._2_4/multiple_vhosts/apache2/apache2.conf
diff --git a/...apache2/conf-available/bad_conf_file.conf → ...apache2/conf-available/bad_conf_file.conf b/...apache2/conf-available/bad_conf_file.conf → ...apache2/conf-available/bad_conf_file.conf
diff --git a/...nf-available/other-vhosts-access-log.conf → ...nf-available/other-vhosts-access-log.conf b/...nf-available/other-vhosts-access-log.conf → ...nf-available/other-vhosts-access-log.conf
diff --git a/...osts/apache2/conf-available/security.conf → ...osts/apache2/conf-available/security.conf b/...osts/apache2/conf-available/security.conf → ...osts/apache2/conf-available/security.conf
diff --git a/...apache2/conf-available/serve-cgi-bin.conf → ...apache2/conf-available/serve-cgi-bin.conf b/...apache2/conf-available/serve-cgi-bin.conf → ...apache2/conf-available/serve-cgi-bin.conf
diff --git a/...conf-enabled/other-vhosts-access-log.conf → ...conf-enabled/other-vhosts-access-log.conf b/...conf-enabled/other-vhosts-access-log.conf → ...conf-enabled/other-vhosts-access-log.conf
diff --git a/...vhosts/apache2/conf-enabled/security.conf → ...vhosts/apache2/conf-enabled/security.conf b/...vhosts/apache2/conf-enabled/security.conf → ...vhosts/apache2/conf-enabled/security.conf
diff --git a/...s/apache2/conf-enabled/serve-cgi-bin.conf → ...s/apache2/conf-enabled/serve-cgi-bin.conf b/...s/apache2/conf-enabled/serve-cgi-bin.conf → ...s/apache2/conf-enabled/serve-cgi-bin.conf
diff --git a/...pache_2_4/multiple_vhosts/apache2/envvars → ...pache_2_4/multiple_vhosts/apache2/envvars b/...pache_2_4/multiple_vhosts/apache2/envvars → ...pache_2_4/multiple_vhosts/apache2/envvars
diff --git a/...sts/apache2/mods-available/authz_svn.load → ...sts/apache2/mods-available/authz_svn.load b/...sts/apache2/mods-available/authz_svn.load → ...sts/apache2/mods-available/authz_svn.load
diff --git a/...le_vhosts/apache2/mods-available/dav.load → ...le_vhosts/apache2/mods-available/dav.load b/...le_vhosts/apache2/mods-available/dav.load → ...le_vhosts/apache2/mods-available/dav.load
diff --git a/...hosts/apache2/mods-available/dav_svn.conf → ...hosts/apache2/mods-available/dav_svn.conf b/...hosts/apache2/mods-available/dav_svn.conf → ...hosts/apache2/mods-available/dav_svn.conf
diff --git a/...hosts/apache2/mods-available/dav_svn.load → ...hosts/apache2/mods-available/dav_svn.load b/...hosts/apache2/mods-available/dav_svn.load → ...hosts/apache2/mods-available/dav_svn.load
diff --git a/...hosts/apache2/mods-available/rewrite.load → ...hosts/apache2/mods-available/rewrite.load b/...hosts/apache2/mods-available/rewrite.load → ...hosts/apache2/mods-available/rewrite.load
diff --git a/...le_vhosts/apache2/mods-available/ssl.conf → ...le_vhosts/apache2/mods-available/ssl.conf b/...le_vhosts/apache2/mods-available/ssl.conf → ...le_vhosts/apache2/mods-available/ssl.conf
diff --git a/...le_vhosts/apache2/mods-available/ssl.load → ...le_vhosts/apache2/mods-available/ssl.load b/...le_vhosts/apache2/mods-available/ssl.load → ...le_vhosts/apache2/mods-available/ssl.load
diff --git a/...hosts/apache2/mods-enabled/authz_svn.load → ...hosts/apache2/mods-enabled/authz_svn.load b/...hosts/apache2/mods-enabled/authz_svn.load → ...hosts/apache2/mods-enabled/authz_svn.load
diff --git a/...iple_vhosts/apache2/mods-enabled/dav.load → ...iple_vhosts/apache2/mods-enabled/dav.load b/...iple_vhosts/apache2/mods-enabled/dav.load → ...iple_vhosts/apache2/mods-enabled/dav.load
diff --git a/..._vhosts/apache2/mods-enabled/dav_svn.conf → ..._vhosts/apache2/mods-enabled/dav_svn.conf b/..._vhosts/apache2/mods-enabled/dav_svn.conf → ..._vhosts/apache2/mods-enabled/dav_svn.conf
diff --git a/..._vhosts/apache2/mods-enabled/dav_svn.load → ..._vhosts/apache2/mods-enabled/dav_svn.load b/..._vhosts/apache2/mods-enabled/dav_svn.load → ..._vhosts/apache2/mods-enabled/dav_svn.load
diff --git a/...he_2_4/multiple_vhosts/apache2/ports.conf → ...he_2_4/multiple_vhosts/apache2/ports.conf b/...he_2_4/multiple_vhosts/apache2/ports.conf → ...he_2_4/multiple_vhosts/apache2/ports.conf
diff --git a/.../apache2/sites-available/000-default.conf → .../apache2/sites-available/000-default.conf b/.../apache2/sites-available/000-default.conf → .../apache2/sites-available/000-default.conf
diff --git a/...osts/apache2/sites-available/certbot.conf → ...osts/apache2/sites-available/certbot.conf b/...osts/apache2/sites-available/certbot.conf → ...osts/apache2/sites-available/certbot.conf
diff --git a/...ites-available/default-ssl-port-only.conf → ...ites-available/default-ssl-port-only.conf b/...ites-available/default-ssl-port-only.conf → ...ites-available/default-ssl-port-only.conf
diff --git a/.../apache2/sites-available/default-ssl.conf → .../apache2/sites-available/default-ssl.conf b/.../apache2/sites-available/default-ssl.conf → .../apache2/sites-available/default-ssl.conf
diff --git a/...pache2/sites-available/duplicatehttp.conf → ...pache2/sites-available/duplicatehttp.conf b/...pache2/sites-available/duplicatehttp.conf → ...pache2/sites-available/duplicatehttp.conf
diff --git a/...ache2/sites-available/duplicatehttps.conf → ...ache2/sites-available/duplicatehttps.conf b/...ache2/sites-available/duplicatehttps.conf → ...ache2/sites-available/duplicatehttps.conf
diff --git a/...vhosts/apache2/sites-available/empty.conf → ...vhosts/apache2/sites-available/empty.conf b/...vhosts/apache2/sites-available/empty.conf → ...vhosts/apache2/sites-available/empty.conf
diff --git a/...2/sites-available/encryption-example.conf → ...2/sites-available/encryption-example.conf b/...2/sites-available/encryption-example.conf → ...2/sites-available/encryption-example.conf
diff --git a/...e2/sites-available/mod_macro-example.conf → ...e2/sites-available/mod_macro-example.conf b/...e2/sites-available/mod_macro-example.conf → ...e2/sites-available/mod_macro-example.conf
diff --git a/...pache2/sites-available/no-directives.conf → ...pache2/sites-available/no-directives.conf b/...pache2/sites-available/no-directives.conf → ...pache2/sites-available/no-directives.conf
diff --git a/...sts/apache2/sites-available/ocsp-ssl.conf → ...sts/apache2/sites-available/ocsp-ssl.conf b/...sts/apache2/sites-available/ocsp-ssl.conf → ...sts/apache2/sites-available/ocsp-ssl.conf
diff --git a/...sts/apache2/sites-available/wildcard.conf → ...sts/apache2/sites-available/wildcard.conf b/...sts/apache2/sites-available/wildcard.conf → ...sts/apache2/sites-available/wildcard.conf
diff --git a/...ts/apache2/sites-enabled/000-default.conf → ...ts/apache2/sites-enabled/000-default.conf b/...ts/apache2/sites-enabled/000-default.conf → ...ts/apache2/sites-enabled/000-default.conf
diff --git a/...vhosts/apache2/sites-enabled/certbot.conf → ...vhosts/apache2/sites-enabled/certbot.conf b/...vhosts/apache2/sites-enabled/certbot.conf → ...vhosts/apache2/sites-enabled/certbot.conf
diff --git a/.../sites-enabled/default-ssl-port-only.conf → .../sites-enabled/default-ssl-port-only.conf b/.../sites-enabled/default-ssl-port-only.conf → .../sites-enabled/default-ssl-port-only.conf
diff --git a/...ts/apache2/sites-enabled/default-ssl.conf → ...ts/apache2/sites-enabled/default-ssl.conf b/...ts/apache2/sites-enabled/default-ssl.conf → ...ts/apache2/sites-enabled/default-ssl.conf
diff --git a/.../apache2/sites-enabled/duplicatehttp.conf → .../apache2/sites-enabled/duplicatehttp.conf b/.../apache2/sites-enabled/duplicatehttp.conf → .../apache2/sites-enabled/duplicatehttp.conf
diff --git a/...apache2/sites-enabled/duplicatehttps.conf → ...apache2/sites-enabled/duplicatehttps.conf b/...apache2/sites-enabled/duplicatehttps.conf → ...apache2/sites-enabled/duplicatehttps.conf
diff --git a/...he2/sites-enabled/encryption-example.conf → ...he2/sites-enabled/encryption-example.conf b/...he2/sites-enabled/encryption-example.conf → ...he2/sites-enabled/encryption-example.conf
diff --git a/...che2/sites-enabled/mod_macro-example.conf → ...che2/sites-enabled/mod_macro-example.conf b/...che2/sites-enabled/mod_macro-example.conf → ...che2/sites-enabled/mod_macro-example.conf
diff --git a/...ts/apache2/sites-enabled/non-symlink.conf → ...ts/apache2/sites-enabled/non-symlink.conf b/...ts/apache2/sites-enabled/non-symlink.conf → ...ts/apache2/sites-enabled/non-symlink.conf
diff --git a/...hosts/apache2/sites-enabled/ocsp-ssl.conf → ...hosts/apache2/sites-enabled/ocsp-ssl.conf b/...hosts/apache2/sites-enabled/ocsp-ssl.conf → ...hosts/apache2/sites-enabled/ocsp-ssl.conf
diff --git a/...hosts/apache2/sites-enabled/wildcard.conf → ...hosts/apache2/sites-enabled/wildcard.conf b/...hosts/apache2/sites-enabled/wildcard.conf → ...hosts/apache2/sites-enabled/wildcard.conf
diff --git a/...a/debian_apache_2_4/multiple_vhosts/sites → ...a/debian_apache_2_4/multiple_vhosts/sites b/...a/debian_apache_2_4/multiple_vhosts/sites → ...a/debian_apache_2_4/multiple_vhosts/sites
diff --git a/...a/gentoo_apache/apache/apache2/httpd.conf → ...a/gentoo_apache/apache/apache2/httpd.conf b/...a/gentoo_apache/apache/apache2/httpd.conf → ...a/gentoo_apache/apache/apache2/httpd.conf
diff --git a/...stdata/gentoo_apache/apache/apache2/magic → ...stdata/gentoo_apache/apache/apache2/magic b/...stdata/gentoo_apache/apache/apache2/magic → ...stdata/gentoo_apache/apache/apache2/magic
diff --git a/...pache2/modules.d/00_default_settings.conf → ...pache2/modules.d/00_default_settings.conf b/...pache2/modules.d/00_default_settings.conf → ...pache2/modules.d/00_default_settings.conf
diff --git a/...apache2/modules.d/00_error_documents.conf → ...apache2/modules.d/00_error_documents.conf b/...apache2/modules.d/00_error_documents.conf → ...apache2/modules.d/00_error_documents.conf
diff --git a/...pache/apache2/modules.d/00_languages.conf → ...pache/apache2/modules.d/00_languages.conf b/...pache/apache2/modules.d/00_languages.conf → ...pache/apache2/modules.d/00_languages.conf
diff --git a/...e/apache2/modules.d/00_mod_autoindex.conf → ...e/apache2/modules.d/00_mod_autoindex.conf b/...e/apache2/modules.d/00_mod_autoindex.conf → ...e/apache2/modules.d/00_mod_autoindex.conf
diff --git a/...apache/apache2/modules.d/00_mod_info.conf → ...apache/apache2/modules.d/00_mod_info.conf b/...apache/apache2/modules.d/00_mod_info.conf → ...apache/apache2/modules.d/00_mod_info.conf
diff --git a/.../apache2/modules.d/00_mod_log_config.conf → .../apache2/modules.d/00_mod_log_config.conf b/.../apache2/modules.d/00_mod_log_config.conf → .../apache2/modules.d/00_mod_log_config.conf
diff --git a/...apache/apache2/modules.d/00_mod_mime.conf → ...apache/apache2/modules.d/00_mod_mime.conf b/...apache/apache2/modules.d/00_mod_mime.conf → ...apache/apache2/modules.d/00_mod_mime.conf
diff --git a/...ache/apache2/modules.d/00_mod_status.conf → ...ache/apache2/modules.d/00_mod_status.conf b/...ache/apache2/modules.d/00_mod_status.conf → ...ache/apache2/modules.d/00_mod_status.conf
diff --git a/...che/apache2/modules.d/00_mod_userdir.conf → ...che/apache2/modules.d/00_mod_userdir.conf b/...che/apache2/modules.d/00_mod_userdir.conf → ...che/apache2/modules.d/00_mod_userdir.conf
diff --git a/...ache/apache/apache2/modules.d/00_mpm.conf → ...ache/apache/apache2/modules.d/00_mpm.conf b/...ache/apache/apache2/modules.d/00_mpm.conf → ...ache/apache/apache2/modules.d/00_mpm.conf
diff --git a/...e/apache2/modules.d/10_mod_mem_cache.conf → ...e/apache2/modules.d/10_mod_mem_cache.conf b/...e/apache2/modules.d/10_mod_mem_cache.conf → ...e/apache2/modules.d/10_mod_mem_cache.conf
diff --git a/.../apache/apache2/modules.d/40_mod_ssl.conf → .../apache/apache2/modules.d/40_mod_ssl.conf b/.../apache/apache2/modules.d/40_mod_ssl.conf → .../apache/apache2/modules.d/40_mod_ssl.conf
diff --git a/...pache/apache2/modules.d/41_mod_http2.conf → ...pache/apache2/modules.d/41_mod_http2.conf b/...pache/apache2/modules.d/41_mod_http2.conf → ...pache/apache2/modules.d/41_mod_http2.conf
diff --git a/.../apache/apache2/modules.d/45_mod_dav.conf → .../apache/apache2/modules.d/45_mod_dav.conf b/.../apache/apache2/modules.d/45_mod_dav.conf → .../apache/apache2/modules.d/45_mod_dav.conf
diff --git a/...apache/apache2/modules.d/46_mod_ldap.conf → ...apache/apache2/modules.d/46_mod_ldap.conf b/...apache/apache2/modules.d/46_mod_ldap.conf → ...apache/apache2/modules.d/46_mod_ldap.conf
diff --git a/...pache2/vhosts.d/00_default_ssl_vhost.conf → ...pache2/vhosts.d/00_default_ssl_vhost.conf b/...pache2/vhosts.d/00_default_ssl_vhost.conf → ...pache2/vhosts.d/00_default_ssl_vhost.conf
diff --git a/...he/apache2/vhosts.d/00_default_vhost.conf → ...he/apache2/vhosts.d/00_default_vhost.conf b/...he/apache2/vhosts.d/00_default_vhost.conf → ...he/apache2/vhosts.d/00_default_vhost.conf
diff --git a/...he/apache2/vhosts.d/default_vhost.include → ...he/apache2/vhosts.d/default_vhost.include b/...he/apache2/vhosts.d/default_vhost.include → ...he/apache2/vhosts.d/default_vhost.include
diff --git a/.../apache2/vhosts.d/gentoo.example.com.conf → .../apache2/vhosts.d/gentoo.example.com.conf b/.../apache2/vhosts.d/gentoo.example.com.conf → .../apache2/vhosts.d/gentoo.example.com.conf
diff --git a/...tdata/gentoo_apache/apache/conf.d/apache2 → ...tdata/gentoo_apache/apache/conf.d/apache2 b/...tdata/gentoo_apache/apache/conf.d/apache2 → ...tdata/gentoo_apache/apache/conf.d/apache2
diff --git a/...tests/testdata/gentoo_apache/apache/sites → ...tests/testdata/gentoo_apache/apache/sites b/...tests/testdata/gentoo_apache/apache/sites → ...tests/testdata/gentoo_apache/apache/sites
diff --git a/certbot-apache/tests/util.py → ...he/certbot_apache/_internal/tests/util.py b/certbot-apache/tests/util.py → ...he/certbot_apache/_internal/tests/util.py
diff --git a/tox.ini b/tox.ini
@@ -132,7 +132,7 @@ commands =
 [testenv:apacheconftest]
 commands =
     {[base]pip_install} acme certbot certbot-apache
-    {toxinidir}/certbot-apache/tests/apache-conf-files/apache-conf-test --debian-modules
+    {toxinidir}/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/apache-conf-test --debian-modules
 passenv =
     SERVER
 
@@ -141,7 +141,7 @@ passenv =
 # environment.
 commands =
     {[base]pip_install} certbot-ci
-    {toxinidir}/certbot-apache/tests/apache-conf-files/apache-conf-test-pebble.py --debian-modules
+    {toxinidir}/certbot-apache/certbot_apache/_internal/tests/apache-conf-files/apache-conf-test-pebble.py --debian-modules
 
 [testenv:apacheconftest-with-pebble]
 commands =