X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=79491e9403a23286a2c6b3d74d4c8b1d6ef6571f;hp=4f8bebecd79dfcd1859421edc0c42695352a11b6;hb=c2146ae32fdef80049abfa13098db2d45f3ebdd5;hpb=d069ae1df141abf4a4c2c258e8255b974e730a47

diff --git a/Makefile b/Makefile
index 4f8bebecd..79491e940 100644
--- a/Makefile
+++ b/Makefile
@@ -52,6 +52,10 @@ HTTPD_RESTART = /etc/init.d/apache restart
 #apache
 #HTTPD_RESTART = /usr/local/apache/bin/apachectl stop; sleep 10; /usr/local/apache/bin/apachectl startssl
 
+#(an include directory, not a file - "Include /etc/apache/conf.d" in httpd.conf)
+#deb (3.1+), 
+APACHE_CONF = /etc/apache/conf.d
+
 FREESIDE_RESTART = ${INIT_FILE} restart
 
 #deb, redhat, fedora, mandrake, suse, others?
@@ -185,6 +189,15 @@ install-init:
 	" ${INIT_FILE}
 	${INIT_INSTALL}
 
+install-apache:
+	[ -d ${APACHE_CONF} ] && \
+	  ( install -o root -m 755 htetc/freeside-base.conf ${APACHE_CONF} && \
+	    ( [ ${RT_ENABLED} -eq 1 ] && install -o root -m 755 htetc/freeside-rt.conf ${APACHE_CONF} || true ) && \
+	    perl -p -i -e "\
+	      s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
+	    " ${APACHE_CONF}/freeside-*.conf \
+	  ) || true
+
 install-selfservice:
 	[ -e ~freeside/.ssh/id_dsa.pub ] || su - freeside -c 'ssh-keygen -t dsa'
 	for MACHINE in ${SELFSERVICE_MACHINES}; do \
@@ -203,7 +216,7 @@ update-selfservice:
 	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; sudo make install" ;\
 	done
 
-install: install-perl-modules install-docs install-init install-rt
+install: install-perl-modules install-docs install-init install-apache install-rt
 
 deploy: install
 	${HTTPD_RESTART}