Revert "Fix: confusing and impractical naming"

This reverts commit 612db70.
jspricke · Nov 29, 2022 · cb0bcaf · cb0bcaf
1 parent d9accfc
commit cb0bcaf
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/debian/apache2.README.Debian b/debian/apache2.README.Debian
@@ -209,12 +209,12 @@ Enabling SSL
 
 To enable SSL, type (as user root):
 
-	a2ensite 000-default-ssl
+	a2ensite default-ssl
 	a2enmod ssl
 
 If you want to use self-signed certificates, you should install the ssl-cert
 package (see below). Otherwise, just adjust the SSLCertificateKeyFile and
-SSLCertificateFile directives in '/etc/apache2/sites-available/000-default-ssl.conf'
+SSLCertificateFile directives in '/etc/apache2/sites-available/default-ssl.conf'
 to point to your SSL certificate. Then restart apache:
 
 	service apache2 restart
@@ -257,7 +257,7 @@ disabled even for non-SSL connections):
 		downgrade-1.0 force-response-1.0
 	BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
 
-The default SSL virtual host in '/etc/apache2/sites-available/000-default-ssl.conf'
+The default SSL virtual host in '/etc/apache2/sites-available/default-ssl.conf'
 already contains this workaround.
 
 

diff --git a/debian/apache2.postinst b/debian/apache2.postinst
@@ -245,7 +245,7 @@ list_fixup_conffiles () {
 	cat <<- EOF
 		/etc/bash_completion.d/apache2
 		/etc/apache2/sites-available/000-default.conf
-		/etc/apache2/sites-available/000-default-ssl.conf
+		/etc/apache2/sites-available/default-ssl.conf
 		/etc/apache2/conf-available/charset.conf
 		/etc/apache2/conf-available/localized-error-pages.conf
 		/etc/apache2/conf-available/other-vhosts-access-log.conf

diff --git a/debian/apache2.preinst.in b/debian/apache2.preinst.in
@@ -29,7 +29,7 @@ list_fixup_conffiles () {
 	cat <<- EOF
 		/etc/bash_completion.d/apache2					6a5f85e62655f6b5c8fa0f95c7c35c9c	removed
 		/etc/apache2/sites-available/000-default.conf			2cc450cf300a880abbc3767fc002477d
-		/etc/apache2/sites-available/000-default-ssl.conf			196d150beeaeaf845ece50d7e84e12de
+		/etc/apache2/sites-available/default-ssl.conf			196d150beeaeaf845ece50d7e84e12de
 		/etc/apache2/conf-available/charset.conf			e6fbb8adf631932851d6cc522c1e48d7
 		/etc/apache2/conf-available/localized-error-pages.conf		844ba27ddb794fc6967bfb56b950e6a8
 		/etc/apache2/conf-available/other-vhosts-access-log.conf	2cad303fc4221d6b0068a8b37597b9fb

diff --git a/...-dir/sites-available/000-default-ssl.conf → ...nfig-dir/sites-available/default-ssl.conf b/...-dir/sites-available/000-default-ssl.conf → ...nfig-dir/sites-available/default-ssl.conf
diff --git a/debian/rules b/debian/rules
@@ -47,7 +47,7 @@ prebuild-checks-stamp:
 
 debian/fixup_conffiles.tgz: \
     debian/config-dir/sites-available/000-default.conf \
-    debian/config-dir/sites-available/000-default-ssl.conf \
+    debian/config-dir/sites-available/default-ssl.conf \
     debian/config-dir/conf-available/charset.conf \
     debian/config-dir/conf-available/localized-error-pages.conf \
     debian/config-dir/conf-available/other-vhosts-access-log.conf \

diff --git a/debian/tests/check-http2 b/debian/tests/check-http2
@@ -6,7 +6,7 @@ set -uxe
 
 a2enmod http2
 a2enmod ssl
-a2ensite 000-default-ssl
+a2ensite default-ssl
 # Enable globally
 echo "Protocols h2c h2 http/1.1" >> /etc/apache2/apache2.conf
 service apache2 restart

diff --git a/debian/tests/ssl-passphrase b/debian/tests/ssl-passphrase
@@ -10,7 +10,7 @@ cd /etc/ssl/private
 [ -f ssl-cert-snakeoil.key.nopassphrase ] || mv ssl-cert-snakeoil.key ssl-cert-snakeoil.key.nopassphrase
 openssl rsa -des3 -in ssl-cert-snakeoil.key.nopassphrase -out ssl-cert-snakeoil.key -passout pass:test
 a2enmod ssl
-a2ensite 000-default-ssl
+a2ensite default-ssl
 
 # respond to systemd-ask-passphrase
 password_responder() {