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 99e14cf..96a430e 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 similarity index 100% rename from debian/config-dir/sites-available/default-ssl.conf rename to debian/config-dir/sites-available/000-default-ssl.conf diff --git a/debian/rules b/debian/rules index 7d286b6..705d226 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 \