summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-27 21:49:27 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-27 21:49:27 +0000
commit37ddd0df91ca4dbdf8d465902ffe8a139503e23d (patch)
treed7503adf476df292faccc86ad933b07c0afb8218
parentEnabling ssl module. (diff)
downloadapache2-37ddd0df91ca4dbdf8d465902ffe8a139503e23d.tar.xz
apache2-37ddd0df91ca4dbdf8d465902ffe8a139503e23d.zip
Renaming default-ssl.conf site to 000-default-ssl.conf.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/apache2.README.Debian6
-rw-r--r--debian/apache2.postinst2
-rw-r--r--debian/apache2.preinst.in2
-rw-r--r--debian/config-dir/sites-available/000-default-ssl.conf (renamed from debian/config-dir/sites-available/default-ssl.conf)0
-rwxr-xr-xdebian/rules2
5 files changed, 6 insertions, 6 deletions
diff --git a/debian/apache2.README.Debian b/debian/apache2.README.Debian
index 5597227..d0ba2ea 100644
--- a/debian/apache2.README.Debian
+++ b/debian/apache2.README.Debian
@@ -209,12 +209,12 @@ Enabling SSL
To enable SSL, type (as user root):
- a2ensite default-ssl
+ a2ensite 000-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/default-ssl.conf'
+SSLCertificateFile directives in '/etc/apache2/sites-available/000-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/default-ssl.conf'
+The default SSL virtual host in '/etc/apache2/sites-available/000-default-ssl.conf'
already contains this workaround.
diff --git a/debian/apache2.postinst b/debian/apache2.postinst
index 89ea87a..67a00f3 100644
--- a/debian/apache2.postinst
+++ b/debian/apache2.postinst
@@ -247,7 +247,7 @@ list_fixup_conffiles () {
cat <<- EOF
/etc/bash_completion.d/apache2
/etc/apache2/sites-available/000-default.conf
- /etc/apache2/sites-available/default-ssl.conf
+ /etc/apache2/sites-available/000-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
index ebd9fe5..15f857f 100644
--- 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/default-ssl.conf 196d150beeaeaf845ece50d7e84e12de
+ /etc/apache2/sites-available/000-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/debian/config-dir/sites-available/default-ssl.conf b/debian/config-dir/sites-available/000-default-ssl.conf
index 330280d..330280d 100644
--- a/debian/config-dir/sites-available/default-ssl.conf
+++ b/debian/config-dir/sites-available/000-default-ssl.conf
diff --git a/debian/rules b/debian/rules
index e7429db..9461014 100755
--- 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/default-ssl.conf \
+ debian/config-dir/sites-available/000-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 \