Changeset 2913 for package_branches

Timestamp:

Jan 22, 2010, 1:28:03 AM (15 years ago)

Author:

gdb

Message:

Made debian work with current invirt-web changes

Location:

package_branches/invirt-web/hvirt/debian

Files:

• changelog (modified) (1 diff)
• invirt-web.init (modified) (1 diff)
• invirt-web.postinst (modified) (1 diff)
• rules (modified) (1 diff)

package_branches/invirt-web/hvirt/debian/changelog

@@ +1 @@
+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
 

package_branches/invirt-web/hvirt/debian/invirt-web.init

@@ -12 +12 @@
 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

package_branches/invirt-web/hvirt/debian/invirt-web.postinst

@@ -22 +22 @@
     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
     ;;
 

package_branches/invirt-web/hvirt/debian/rules

@@ -1 +1 @@
 #!/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