[freeside-commits] freeside Makefile,1.197,1.198

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside
In directory wavetail.420.am:/tmp/cvs-serv16912

Modified Files:
	Makefile 
Log Message:
torrus, RT#10574

Index: Makefile
===================================================================
RCS file: /home/cvs/cvsroot/freeside/Makefile,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -w -d -r1.197 -r1.198
--- Makefile	30 Nov 2010 01:20:26 -0000	1.197
+++ Makefile	27 Dec 2010 08:40:19 -0000	1.198
@@ -108,6 +108,8 @@
 #for now, same db as specified in DATASOURCE... eventually, otherwise?
 RT_DB_DATABASE = freeside
 
+TORRUS_ENABLED = 0
+
 # for cvs-upgrade-deploy target, the username who checked out the CVS copy.
 CVS_USER = ivan
 
@@ -261,6 +263,7 @@
 	[ -d ${APACHE_CONF} ] && \
 	  ( install -o root -m 755 htetc/freeside-base${APACHE_VERSION}.conf ${APACHE_CONF} && \
 	    ( [ ${RT_ENABLED} -eq 1 ] && install -o root -m 755 htetc/freeside-rt.conf ${APACHE_CONF} || true ) && \
+	    ( [ ${TORRUS_ENABLED} -eq 1 ] && install -o root -m 755 htetc/freeside-torrus.conf ${APACHE_CONF} || true ) && \
 	    perl -p -i -e "\
 	      s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
 	      s'%%%FREESIDE_CONF%%%'${FREESIDE_CONF}'g; \
@@ -374,6 +377,18 @@
 	  s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
 	" ${RT_PATH}/etc/RT_SiteConfig.pm; fi
 
+configure-torrus:
+	cd torrus; \
+	torrus_user=freeside var_user=freeside var_group=freeside ./configure
+
+install-torrus:
+	cd torrus; \
+	make; \
+	make install
+	perl -p -i -e "\
+	  s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
+	" /usr/local/etc/torrus/conf/torrus-siteconfig.pl
+
 clean:
 	rm -rf masondocs
 	rm -rf httemplate/docs/man