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

diff --git a/Makefile b/Makefile
index 10b96e25d..2f696dc21 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}
 
@@ -345,7 +346,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 +355,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 "\
+	[ ${RT_ENABLED} -eq 1 ] && ( cd rt; make install ) || true
+	[ ${RT_ENABLED} -eq 1 ] && 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
 
 clean:
 	rm -rf masondocs