Index: /package_branches/invirt-web/hvirt/debian/changelog
===================================================================
--- /package_branches/invirt-web/hvirt/debian/changelog	(revision 2912)
+++ /package_branches/invirt-web/hvirt/debian/changelog	(revision 2913)
@@ -1,2 +1,8 @@
+invirt-web (0.1.5hvirt1) unstable; urgency=low
+
+  * Generalized config.
+
+ -- Greg Brockman <gdb@mit.edu>  Fri, 22 Jan 2010 01:17:40 -0500
+
 invirt-web (0.1.5) unstable; urgency=low
 
Index: /package_branches/invirt-web/hvirt/debian/invirt-web.init
===================================================================
--- /package_branches/invirt-web/hvirt/debian/invirt-web.init	(revision 2912)
+++ /package_branches/invirt-web/hvirt/debian/invirt-web.init	(revision 2913)
@@ -12,5 +12,5 @@
 PACKAGE=invirt-web
 PARENTPACKAGE=apache2
-GEN_FILES=(/etc/apache2/sites-available/{default,ssl,svn} /etc/invirt-iptables/rules.d/50-invirt-web)
+GEN_FILES=(/etc/apache2/sites-available/master /etc/invirt-iptables/rules.d/50-invirt-web)
 
 . /lib/init/config-init.sh
Index: /package_branches/invirt-web/hvirt/debian/invirt-web.postinst
===================================================================
--- /package_branches/invirt-web/hvirt/debian/invirt-web.postinst	(revision 2912)
+++ /package_branches/invirt-web/hvirt/debian/invirt-web.postinst	(revision 2913)
@@ -22,13 +22,13 @@
     configure)
 	cd /var/www/invirt-web
-	make all
-
-	a2enmod rewrite
-	a2enmod ssl
-	a2enmod auth_sslcert
+	make
+	a2dissite default
+	for mod in $(invirt-getconf web.mods); do
+	    a2enmod ${mod}
+	done
         
         # Our init script proxies all requests to Apache's, so Apache's
         # running is just a NOP
-        update-rc.d -f apache2 remove
+        # update-rc.d -f apache2 remove
     ;;
 
Index: /package_branches/invirt-web/hvirt/debian/rules
===================================================================
--- /package_branches/invirt-web/hvirt/debian/rules	(revision 2912)
+++ /package_branches/invirt-web/hvirt/debian/rules	(revision 2913)
@@ -1,7 +1,3 @@
 #!/usr/bin/make -f
-
-DEB_DIVERT_EXTENSION = .invirt
-DEB_DIVERT_FILES_invirt-web += \
-    /etc/init.d/apache2
 
 include /usr/share/cdbs/1/rules/debhelper.mk