X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2FMakefile;h=9d5fde00fd7c9568ead55c5b819ae2e69ac5de3e;hb=10cddd917072b9d148b30c7561db34b0133695f4;hp=e89a69ac567c729bd7f9d6df1b892cbd1b5bf963;hpb=b4b0c7e72d7eaee2fbfc7022022c9698323203dd;p=freeside.git

diff --git a/rt/Makefile b/rt/Makefile
index e89a69ac5..9d5fde00f 100644
--- a/rt/Makefile
+++ b/rt/Makefile
@@ -52,9 +52,9 @@
 
 
 PERL			=	/usr/bin/perl
-INSTALL			=	install-sh
+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	=	7
+RT_VERSION_PATCH	=	8
 
 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,11 +82,11 @@ 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
+APACHECTL		=	
 
 # {{{ Files and directories 
 
@@ -106,14 +106,15 @@ RT_LIB_PATH		=	/opt/rt3/lib
 RT_MAN_PATH		=	/opt/rt3/man
 RT_VAR_PATH		=	/opt/rt3/var
 RT_DOC_PATH		=	/opt/rt3/share/doc
+RT_FONT_PATH		=	/opt/rt3/share/fonts
 RT_LOCAL_PATH		=	/opt/rt3/local
 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
 
@@ -134,6 +135,8 @@ RT_STANDALONE_SERVER	=	standalone_httpd
 RT_SPEEDYCGI_HANDLER	=	mason_handler.scgi
 # RT_FASTCGI_HANDLER is the mason handler script for FastCGI
 RT_FASTCGI_HANDLER	=	mason_handler.fcgi
+# RT_FASTCGI_SERVER is the FastCGI server
+RT_FASTCGI_SERVER	=	fastcgi_server
 # RT_WIN32_FASTCGI_HANDLER is the mason handler script for FastCGI
 RT_WIN32_FASTCGI_HANDLER	=	mason_handler.svc
 # RT's CLI
@@ -153,6 +156,7 @@ BINARIES		=	$(RT_MODPERL_HANDLER) \
 				$(RT_STANDALONE_SERVER) \
 				$(RT_SPEEDYCGI_HANDLER) \
 				$(RT_FASTCGI_HANDLER) \
+				$(RT_FASTCGI_SERVER) \
 				$(RT_WIN32_FASTCGI_HANDLER)
 
 
@@ -189,7 +193,7 @@ ETC_FILES		=	acl.Informix \
 
 # {{{ Web frontend
 
-WEB_HANDLER		=	standalone
+WEB_HANDLER		=	modperl2
 
 # }}}
 
@@ -201,7 +205,7 @@ WEB_HANDLER		=	standalone
 # "Pg" is known to work
 # "Informix" is known to work
 
-DB_TYPE			=	SQLite
+DB_TYPE			=	Pg
 
 # Set DBA to the name of a unix account with the proper permissions and 
 # environment to run your commandline SQL sbin
@@ -213,7 +217,7 @@ DB_TYPE			=	SQLite
 # For Oracle, you want 'system'
 # For Informix, you want 'informix'
 
-DB_DBA			=	root
+DB_DBA			=	freeside
 
 DB_HOST			=	localhost
 
@@ -239,9 +243,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		=	
 
 # }}}
 
@@ -284,7 +288,7 @@ upgrade-instruct:
 
 upgrade: testdeps config-install dirs files-install fixperms upgrade-instruct
 
-upgrade-noclobber: config-install dirs libs-install html-install bin-install local-install doc-install fixperms
+upgrade-noclobber: config-install dirs libs-install html-install bin-install local-install doc-install font-install fixperms
 
 
 # {{{ dependencies
@@ -312,7 +316,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.
@@ -349,6 +353,7 @@ fixperms:
 # {{{ dirs
 dirs:
 	$(INSTALL) -m 0755 -d $(DESTDIR)$(RT_LOG_PATH)
+	$(INSTALL) -m 0755 -d $(DESTDIR)$(RT_FONT_PATH)
 	$(INSTALL) -m 0770 -d $(DESTDIR)$(MASON_DATA_PATH)
 	$(INSTALL) -m 0770 -d $(DESTDIR)$(MASON_DATA_PATH)/cache
 	$(INSTALL) -m 0770 -d $(DESTDIR)$(MASON_DATA_PATH)/etc
@@ -364,7 +369,7 @@ dirs:
 
 install: testdeps config-install dirs files-install fixperms instruct
 
-files-install: libs-install etc-install config-install bin-install sbin-install html-install local-install doc-install
+files-install: libs-install etc-install config-install bin-install sbin-install html-install local-install doc-install font-install
 
 config-install:
 	$(INSTALL) -m 0755 -o $(BIN_OWNER) -g $(RTGROUP) -d $(DESTDIR)$(CONFIG_FILE_PATH)
@@ -423,6 +428,14 @@ html-install:
 	done
 # }}}
 
+# {{{ font-install
+font-install:
+	[ -d $(DESTDIR)$(RT_FONT_PATH) ] || $(INSTALL) -m 0755 -d $(DESTDIR)$(RT_FONT_PATH)
+	-( cd share/fonts && find . -type f -print ) | while read file ; do \
+	    $(INSTALL) -m 0644 "share/fonts/$$file" "$(DESTDIR)$(RT_FONT_PATH)/$$file" ; \
+	done
+# }}}
+
 # {{{ doc-install
 doc-install:
 	# RT 3.0.0 - RT 3.0.2 would accidentally create a file instead of a dir