From: ivan <ivan>
Date: Fri, 20 Jun 2008 03:00:18 +0000 (+0000)
Subject: welcome to the future already.  default to apache 2
X-Git-Tag: freeside_1_7_4rc1~279
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=bcc0d480fa72ef67088eb4c76bbfb924d4dc3d69;p=freeside.git

welcome to the future already.  default to apache 2
---

diff --git a/Makefile b/Makefile
index f06839591..3fed551b4 100644
--- a/Makefile
+++ b/Makefile
@@ -22,11 +22,11 @@ MASON_HANDLER = ${FREESIDE_CONF}/handler.pl
 MASONDATA = ${FREESIDE_CACHE}/masondata
 
 #mod_perl v1
-APACHE_VERSION = 1
+#APACHE_VERSION = 1
 #mod_perl v2 prereleases up to and including 1.999_21
 #APACHE_VERSON = 1.99
 #mod_perl v2 proper and prereleases 1.999_22 and after
-#APACHE_VERSION = 2
+APACHE_VERSION = 2
 
 #deb
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
@@ -54,9 +54,9 @@ INIT_INSTALL = /usr/sbin/update-rc.d freeside defaults 21 20
 #INIT_INSTALL = /usr/bin/true
 
 #deb, suse
-HTTPD_RESTART = /etc/init.d/apache restart
+#HTTPD_RESTART = /etc/init.d/apache restart
 #deb w/apache2
-#HTTPD_RESTART = /etc/init.d/apache2 restart
+HTTPD_RESTART = /etc/init.d/apache2 restart
 #redhat, fedora, mandrake
 #HTTPD_RESTART = /etc/init.d/httpd restart
 #freebsd