X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=aca452fd3f1361dcede90d935f59d703185c2a0e;hp=10b96e25d49eb7efd57fd28c11bdb0df65fa35b9;hb=ad7f49821d40ffd099a45acc32ba91e0e211aede;hpb=63a268637b2d51a8766412617724b9436439deb6

diff --git a/Makefile b/Makefile
index 10b96e25d..aca452fd3 100644
--- a/Makefile
+++ b/Makefile
@@ -171,6 +171,7 @@ install-docs: docs
 	cp -r masondocs ${FREESIDE_DOCUMENT_ROOT}
 	chown -R freeside:freeside ${FREESIDE_DOCUMENT_ROOT}
 	cp htetc/handler.pl ${MASON_HANDLER}
+	cp htetc/htpasswd.logout ${FREESIDE_CONF}
 	[ ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
 	chown -R freeside ${MASONDATA}
 
@@ -203,6 +204,7 @@ perl-modules:
 	  s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
 	" blib/lib/FS/Cron/*.pm;\
 	perl -p -i -e "\
+	  s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
 	  s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
 	  s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\
 	" blib/lib/FS/part_export/*.pm;\
@@ -345,7 +347,8 @@ configure-rt:
 	            --with-db-rt-pass=${DB_PASSWORD} \
 	            --with-web-user=freeside \
 	            --with-web-group=freeside \
-	            --with-rt-group=freeside
+	            --with-rt-group=freeside \
+	            --with-web-handler=modperl2
 
 create-rt: configure-rt
 	[ -d /opt           ] || mkdir /opt           #doh
@@ -353,20 +356,23 @@ create-rt: configure-rt
 	[ -d /opt/rt3/share ] || mkdir /opt/rt3/share #
 	cd rt; make install
 	rt/sbin/rt-setup-database --dba '${DB_USER}' \
-	                          -dba-password '${DB_PASSWORD}' \
-	                          -action schema \
+	                          --dba-password '${DB_PASSWORD}' \
+	                          --action schema \
 	 || true
-	rt/sbin/rt-setup-database --action insert_initial \
-	&& rt/sbin/rt-setup-database --action insert --datafile ${RT_PATH}/etc/initialdata \
+	rt/sbin/rt-setup-database --dba-password '${DB_PASSWORD}' \
+	                          --action coredata \
+	&& rt/sbin/rt-setup-database --dba-password '${DB_PASSWORD}' \
+	                             --action insert \
+	                             --datafile ${RT_PATH}/etc/initialdata \
 	|| true
 
 install-rt:
-	perl -p -i -e "\
+	if [ ${RT_ENABLED} -eq 1 ]; then ( cd rt; make install ); fi
+	if [ ${RT_ENABLED} -eq 1 ]; then perl -p -i -e "\
 	  s'%%%RT_DOMAIN%%%'${RT_DOMAIN}'g;\
 	  s'%%%RT_TIMEZONE%%%'${RT_TIMEZONE}'g;\
 	  s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
-	" ${RT_PATH}/etc/RT_SiteConfig.pm
-	[ ${RT_ENABLED} -eq 1 ] && ( cd rt; make install ) || true
+	" ${RT_PATH}/etc/RT_SiteConfig.pm; fi
 
 clean:
 	rm -rf masondocs