|
diff -u apache2-2.2.6/debian/changelog apache2-2.2.6/debian/changelog
--- apache2-2.2.6/debian/changelog
+++ apache2-2.2.6/debian/changelog
@@ -1,3 +1,10 @@
+apache2 (2.2.6-4) unstable; urgency=low
+
+ * Enabled SSL using the snakeoil cert and key generated
+ by the ssl-cert package.
+
+ -- Adam Sommer Wed, 09 Jan 2008 20:26:42 +0000
+
apache2 (2.2.6-3) unstable; urgency=low
* Allocate fewer bucket brigades in case of a flush bucket. This might help
diff -u apache2-2.2.6/debian/patches/00list apache2-2.2.6/debian/patches/00list
--- apache2-2.2.6/debian/patches/00list
+++ apache2-2.2.6/debian/patches/00list
@@ -22,0 +23 @@
+057_enable_ssl.dpatch
only in patch2:
unchanged:
--- apache2-2.2.6.orig/debian/patches/057_enable_ssl.dpatch
+++ apache2-2.2.6/debian/patches/057_enable_ssl.dpatch
@@ -0,0 +1,61 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 057_enable_ssl.dpatch by
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Enables SSL for NEW installs.
+
+@DPATCH@
+diff -urNad apache2-2.2.6~/debian/apache2.2-common.postinst apache2-2.2.6/debian/apache2.2-common.postinst
+--- apache2-2.2.6~/debian/apache2.2-common.postinst 2008-01-09 15:11:07.000000000 +0000
++++ apache2-2.2.6/debian/apache2.2-common.postinst 2008-01-09 20:22:27.000000000 +0000
+@@ -41,6 +41,10 @@
+ touch /var/log/apache2/error.log /var/log/apache2/access.log
+ chown root:adm /var/log/apache2/error.log /var/log/apache2/access.log
+ chmod 0640 /var/log/apache2/error.log /var/log/apache2/access.log
++
++ # Enable mod_ssl
++ ln -s /etc/apache2/mods-available/ssl.conf /etc/apache2/mods-enabled/
++ ln -s /etc/apache2/mods-available/ssl.load /etc/apache2/mods-enabled/
+ fi
+
+ # Note, this line catches new installs as well as upgrades
+diff -urNad apache2-2.2.6~/debian/config-dir/sites-available/default apache2-2.2.6/debian/config-dir/sites-available/default
+--- apache2-2.2.6~/debian/config-dir/sites-available/default 2008-01-09 15:11:07.000000000 +0000
++++ apache2-2.2.6/debian/config-dir/sites-available/default 2008-01-09 20:19:14.000000000 +0000
+@@ -1,5 +1,5 @@
+-NameVirtualHost *
+-
++NameVirtualHost *:80
++
+ ServerAdmin webmaster@localhost
+
+ DocumentRoot /var/www/
+@@ -44,3 +44,16 @@
+
+
+
++
++ ServerAdmin webmaster@localhost
++
++ DocumentRoot /var/www/
++
++ # Optionally replace ssl-cert-snakeoil.pem and ssl-cert-snakeoil.key with your own
++ # certificate and key.
++ SSLEngine on
++ SSLOptions +StrictRequire
++ SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
++ SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
++
++
+diff -urNad apache2-2.2.6~/debian/control apache2-2.2.6/debian/control
+--- apache2-2.2.6~/debian/control 2008-01-09 15:11:07.000000000 +0000
++++ apache2-2.2.6/debian/control 2008-01-09 20:18:01.000000000 +0000
+@@ -11,7 +11,7 @@
+
+ Package: apache2.2-common
+ Architecture: any
+-Depends: ${shlibs:Depends}, ${misc:Depends}, apache2-utils, net-tools, libmagic1, mime-support, lsb-base, procps [!hurd-i386]
++Depends: ${shlibs:Depends}, ${misc:Depends}, apache2-utils, net-tools, libmagic1, mime-support, lsb-base, procps [!hurd-i386], ssl-cert
+ Suggests: www-browser, apache2-doc
+ Conflicts: apache2-common, libapache2-mod-php5 (<= 5.1.6-3), libapache2-mod-php4 (<= 4:4.4.4-2), libapache2-mod-mime-xattr (<= 0.3-2), libapache2-mod-mono (<= 1.1.17-3), libapache2-mod-proxy-html (<= 2.4.3-2), libapache2-mod-scgi (<= 1.11-1), libapache2-mod-speedycgi (<= 2.22-3), libapache2-modxslt (<= 2005072700-1), libapache2-redirtoservername (<= 0.1-1), libapache2-webauth (<= 3.5.3-1), libapache2-webkdc (<= 3.5.3-1)
+ Replaces: apache2-common
|
