X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rt%2FMakefile;h=f2f136e0aacf3e9c0e55b3026adf626de497964b;hp=148c8542f277ae8dc7c9937fa8a6f4bef9c6a090;hb=86b5edc2d448cb9c8e90b76b77b21b09d69d8527;hpb=fc6209f398899f0211cfcedeb81a3cd65e04a941

diff --git a/rt/Makefile b/rt/Makefile
index 148c8542f..f2f136e0a 100644
--- a/rt/Makefile
+++ b/rt/Makefile
@@ -51,10 +51,10 @@
 #
 
 
-PERL			=	/Users/falcone/perl5/perlbrew/bin/perl
+PERL			=	/usr/bin/perl
 INSTALL			=	/usr/bin/install -c
 
-RT_LAYOUT		=	relative
+RT_LAYOUT		=	Freeside
 
 CONFIG_FILE_PATH	=	/opt/rt3/etc
 CONFIG_FILE		=	$(CONFIG_FILE_PATH)/RT_Config.pm
@@ -63,14 +63,14 @@ SITE_CONFIG_FILE	=	$(CONFIG_FILE_PATH)/RT_SiteConfig.pm
 
 RT_VERSION_MAJOR	=	3
 RT_VERSION_MINOR	=	8
-RT_VERSION_PATCH	=	9
+RT_VERSION_PATCH	=	11
 
 RT_VERSION		=	$(RT_VERSION_MAJOR).$(RT_VERSION_MINOR).$(RT_VERSION_PATCH)
 TAG 			=	rt-$(RT_VERSION_MAJOR)-$(RT_VERSION_MINOR)-$(RT_VERSION_PATCH)
 
 
 # This is the group that all of the installed files will be chgrp'ed to.
-RTGROUP			=	www
+RTGROUP			=	freeside
 
 
 # User which should own rt binaries.
@@ -82,8 +82,8 @@ LIBS_OWNER 		=	root
 # Group that should own all of RT's libraries, generally root.
 LIBS_GROUP		=	bin
 
-WEB_USER		=	www
-WEB_GROUP		=	www
+WEB_USER		=	freeside
+WEB_GROUP		=	freeside
 
 
 APACHECTL		=	/usr/sbin/apachectl
@@ -112,9 +112,9 @@ LOCAL_PLUGIN_PATH	=	/opt/rt3/local/plugins
 LOCAL_ETC_PATH		=	/opt/rt3/local/etc
 LOCAL_LIB_PATH		=	/opt/rt3/local/lib
 LOCAL_LEXICON_PATH	=	/opt/rt3/local/po
-MASON_HTML_PATH		=	/opt/rt3/share/html
+MASON_HTML_PATH		=	/var/www/freeside/rt
 MASON_LOCAL_HTML_PATH	=	/opt/rt3/local/html
-MASON_DATA_PATH		=	/opt/rt3/var/mason_data
+MASON_DATA_PATH		=	/usr/local/etc/freeside/masondata
 MASON_SESSION_PATH	=	/opt/rt3/var/session_data
 RT_LOG_PATH		=       /opt/rt3/var/log
 
@@ -170,6 +170,7 @@ SYSTEM_BINARIES		=	rt-attributes-viewer \
 				rt-email-dashboards \
 				rt-email-group-admin \
 				rt-server \
+				rt-session-viewer \
 				rt-test-dependencies \
 				rt-clean-sessions \
 				rt-shredder \
@@ -194,7 +195,7 @@ ETC_FILES		=	acl.Informix \
 
 # {{{ Web frontend
 
-WEB_HANDLER		=	fastcgi
+WEB_HANDLER		=	modperl2
 
 # }}}
 
@@ -206,7 +207,7 @@ WEB_HANDLER		=	fastcgi
 # "Pg" is known to work
 # "Informix" is known to work
 
-DB_TYPE			=	mysql
+DB_TYPE			=	Pg
 
 # Set DBA to the name of a unix account with the proper permissions and 
 # environment to run your commandline SQL sbin
@@ -218,7 +219,7 @@ DB_TYPE			=	mysql
 # For Oracle, you want 'system'
 # For Informix, you want 'informix'
 
-DB_DBA			=	root
+DB_DBA			=	freeside
 
 DB_HOST			=	localhost
 
@@ -244,9 +245,9 @@ DB_RT_HOST		=	localhost
 # set this to the name you want to give to the RT database in 
 # your database server. For Oracle, this should be the name of your sid
 
-DB_DATABASE		=	rt3
-DB_RT_USER		=	rt_user
-DB_RT_PASS		=	rt_pass
+DB_DATABASE		=	freeside
+DB_RT_USER		=	freeside
+DB_RT_PASS		=	
 
 # }}}
 
@@ -317,7 +318,7 @@ fixperms:
 	chmod $(RT_READABLE_DIR_MODE) $(DESTDIR)$(RT_BIN_PATH)
 
 	chmod 0755 $(DESTDIR)$(RT_ETC_PATH)
-	cd $(DESTDIR)$(RT_ETC_PATH) && chmod 0400 $(ETC_FILES)
+	cd $(DESTDIR)$(RT_ETC_PATH) && chmod 0400 $(ETC_FILES) || true
 
 	#TODO: the config file should probably be able to have its
 	# owner set separately from the binaries.
@@ -326,6 +327,8 @@ fixperms:
 
 	chmod 0440 $(DESTDIR)$(CONFIG_FILE)
 	chmod 0640 $(DESTDIR)$(SITE_CONFIG_FILE)
+	# Make this externally readable
+	chmod 0440 $(DESTDIR)$(RT_ETC_PATH)/initialdata
 
 	# Make the system binaries
 	cd $(DESTDIR)$(RT_BIN_PATH) && ( chmod 0755 $(BINARIES) ; chown $(BIN_OWNER) $(BINARIES);  chgrp $(RTGROUP) $(BINARIES))
@@ -526,7 +529,7 @@ apachectl:
 SNAPSHOT=$(shell git describe --tags)
 snapshot:
 	git archive --prefix "$(SNAPSHOT)/"  HEAD | tar -xf -
-	( cd $(SNAPSHOT) && autoconf && ./configure )
+	( cd $(SNAPSHOT) && autoconf && PERL=/usr/bin/perl ./configure )
 	tar -czf "$(SNAPSHOT).tar.gz" "$(SNAPSHOT)/"
 	rm -fr "$(SNAPSHOT)/"