From f25102df3248c8731fd6a5297e79ea8253d70f06 Mon Sep 17 00:00:00 2001
From: Keegan McAllister <keegan@humbughq.com>
Date: Thu, 13 Sep 2012 11:26:28 -0400
Subject: [PATCH] Add Apache ports.conf

(imported from commit c99ceef008176ca380d242e7b5fcd62d2723099d)
---
 servers/humbug-dev/apache/ports.conf | 24 ++++++++++++++++++++++++
 servers/humbug-dev/setup.bash        |  1 +
 2 files changed, 25 insertions(+)
 create mode 100644 servers/humbug-dev/apache/ports.conf

diff --git a/servers/humbug-dev/apache/ports.conf b/servers/humbug-dev/apache/ports.conf
new file mode 100644
index 0000000000..34456f25dd
--- /dev/null
+++ b/servers/humbug-dev/apache/ports.conf
@@ -0,0 +1,24 @@
+# If you just change the port or add more ports here, you will likely also
+# have to change the VirtualHost statement in
+# /etc/apache2/sites-enabled/000-default
+# This is also true if you have upgraded from before 2.2.9-3 (i.e. from
+# Debian etch). See /usr/share/doc/apache2.2-common/NEWS.Debian.gz and
+# README.Debian.gz
+
+NameVirtualHost *:80
+Listen 80
+
+<IfModule mod_ssl.c>
+    # If you add NameVirtualHost *:443 here, you will also have to change
+    # the VirtualHost statement in /etc/apache2/sites-available/default-ssl
+    # to <VirtualHost *:443>
+    # Server Name Indication for SSL named virtual hosts is currently not
+    # supported by MSIE on Windows XP.
+    NameVirtualHost *:443
+    Listen 443
+</IfModule>
+
+<IfModule mod_gnutls.c>
+    Listen 443
+</IfModule>
+
diff --git a/servers/humbug-dev/setup.bash b/servers/humbug-dev/setup.bash
index a2bab5ba43..a5e3a71851 100755
--- a/servers/humbug-dev/setup.bash
+++ b/servers/humbug-dev/setup.bash
@@ -56,6 +56,7 @@ yes '' | apt-get install -t squeeze-backports python-django
 
 # Configure Apache
 a2enmod proxy proxy_http rewrite auth_digest ssl headers
+cp apache/ports.conf /etc/apache2/
 rm -f /etc/apache2/sites-enabled/*
 cp apache/sites/* /etc/apache2/sites-available/
 ln -s ../sites-available/humbug-default /etc/apache2/sites-enabled/000-default