X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=18944c51b30d2bbe9179d64d202a53b8df10a3e7;hb=781f1fd28bb3dbe75fd24c627792618409da7143;hp=2a8d93c2f1232b33d502f123e8fcf4309f7704a3;hpb=3f8ef5c72aa4fbfad5c320d91abdd4f2d547c029;p=freeside.git

diff --git a/Makefile b/Makefile
index 2a8d93c2f..18944c51b 100644
--- a/Makefile
+++ b/Makefile
@@ -26,13 +26,6 @@ MASONDATA = ${FREESIDE_CACHE}/masondata
 #package maintainers
 DIST_CONF = ${FREESIDE_CONF}/default_conf
 
-#mod_perl v1
-#APACHE_VERSION = 1
-#mod_perl v2 prereleases up to and including 1.999_21
-#APACHE_VERSON = 1.99
-#mod_perl v2 proper and prereleases 1.999_22 and after
-APACHE_VERSION = 2
-
 #deb
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
 #redhat, fedora, mandrake
@@ -198,6 +191,7 @@ perl-modules:
 	  s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\
 	  s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
 	  s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \
+	  s'%%%RT_PATH%%%'${RT_PATH}'g; \
 	  s'%%%MASONDATA%%%'${MASONDATA}'g;\
 	" blib/lib/FS/*.pm;\
 	perl -p -i -e "\
@@ -261,7 +255,7 @@ install-init:
 install-apache:
 	[ -e ${APACHE_CONF}/freeside-base.conf ] && rm ${APACHE_CONF}/freeside-base.conf || true
 	[ -d ${APACHE_CONF} ] && \
-	  ( install -o root -m 755 htetc/freeside-base${APACHE_VERSION}.conf ${APACHE_CONF} && \
+	  ( install -o root -m 755 htetc/freeside-base2.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 "\
@@ -290,7 +284,12 @@ update-selfservice:
 	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; sudo make install" ;\
 	done
 
-install: install-perl-modules install-docs install-init install-apache install-rt install-texmf
+install-chown:
+	chown freeside "${FREESIDE_CACHE}/counters.${DATASOURCE}"
+	chown freeside "${FREESIDE_CACHE}/cache.${DATASOURCE}"
+	chown freeside "${FREESIDE_EXPORT}/export.${DATASOURCE}"
+
+install: install-perl-modules install-docs install-init install-apache install-rt install-torrus install-texmf install-chown
 
 deploy: install
 	${HTTPD_RESTART}
@@ -382,12 +381,14 @@ configure-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
+	if [ ${TORRUS_ENABLED} -eq 1 ]; then ( cd torrus; \
+	  make; \
+	  make install; \
+	  perl -p -i -e "\
+	    s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
+	  " /usr/local/etc/torrus/conf/torrus-siteconfig.pl; \
+	  torrus clearcache \
+	);fi
 
 clean:
 	rm -rf masondocs