X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=2f696dc2145bc6e34f854b94a613f2327cab4693;hb=8a0204b4a129a3c26dcca18ba401b2de26d22d2b;hp=df85a062a943f1ac9179688de396dff5e5a81807;hpb=0afdc0be8cbbb9d2c7657385e3e06a4dd3086f36;p=freeside.git

diff --git a/Makefile b/Makefile
index df85a062a..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}
 
@@ -314,12 +315,6 @@ create-config: install-perl-modules
 	chmod 600 ${FREESIDE_CONF}/secrets
 	chown freeside ${FREESIDE_CONF}/secrets
 
-	mkdir "${FREESIDE_CONF}/conf.${DATASOURCE}"
-	rm -rf conf/registries #old dirs just won't go away
-	#cp conf/[a-z]* "${FREESIDE_CONF}/conf.${DATASOURCE}"
-	cp `ls -d conf/[a-z]* | grep -v CVS` "${FREESIDE_CONF}/conf.${DATASOURCE}"
-	chown -R freeside "${FREESIDE_CONF}/conf.${DATASOURCE}"
-
 	mkdir "${FREESIDE_CACHE}/counters.${DATASOURCE}"
 	chown freeside "${FREESIDE_CACHE}/counters.${DATASOURCE}"
 
@@ -333,7 +328,8 @@ create-config: install-perl-modules
 	install -d $(DIST_CONF)
 	#install conf/[a-z]* $(DEFAULT_CONF)
 	#CVS is not [a-z]
-	install `ls -d conf/[a-z]* | grep -v CVS` $(DIST_CONF)
+	install `ls -d conf/[a-z]* | grep -v CVS | grep -v '^conf/registries'` $(DIST_CONF)
+
 
 configure-rt:
 	cd rt; \
@@ -350,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
@@ -358,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