X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=a820cb1e6f7b043344340de58d2d0421fa422c8b;hb=34f91089a0d54fa39d622ec5e03d9e09a50e9f79;hp=781467f3f80f6cec726a9eb3a5a0dcd2729ac925;hpb=983359e82af73969459b80b74626af7f3341f3e4;p=freeside.git

diff --git a/Makefile b/Makefile
index 781467f3f..a820cb1e6 100644
--- a/Makefile
+++ b/Makefile
@@ -3,12 +3,14 @@
 #solaris and perhaps other very weirdass /bin/sh
 #SHELL="/bin/ksh"
 
-DATASOURCE = DBI:Pg:dbname=freeside
-#DATASOURCE=DBI:mysql:freeside
+DB_TYPE = Pg
+#DB_TYPE = mysql
 
 DB_USER = freeside
 DB_PASSWORD=
 
+DATASOURCE = DBI:${DB_TYPE}:dbname=freeside
+
 #changable now (some things which should go to the others still go to CONF)
 FREESIDE_CONF = /usr/local/etc/freeside
 FREESIDE_LOG = /usr/local/etc/freeside
@@ -20,14 +22,11 @@ MASON_HANDLER = ${FREESIDE_CONF}/handler.pl
 MASONDATA = ${FREESIDE_CACHE}/masondata
 
 #mod_perl v1
-APACHE_VERSION = 1
+#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
-
-# only mason now
-TEMPLATE = mason
+APACHE_VERSION = 2
 
 #deb
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
@@ -55,7 +54,9 @@ INIT_INSTALL = /usr/sbin/update-rc.d freeside defaults 21 20
 #INIT_INSTALL = /usr/bin/true
 
 #deb, suse
-HTTPD_RESTART = /etc/init.d/apache restart
+#HTTPD_RESTART = /etc/init.d/apache restart
+#deb w/apache2
+HTTPD_RESTART = /etc/init.d/apache2 restart
 #redhat, fedora, mandrake
 #HTTPD_RESTART = /etc/init.d/httpd restart
 #freebsd
@@ -65,9 +66,9 @@ HTTPD_RESTART = /etc/init.d/apache restart
 #apache
 #HTTPD_RESTART = /usr/local/apache/bin/apachectl stop; sleep 10; /usr/local/apache/bin/apachectl startssl
 
-#(an include directory, not a file - "Include /etc/apache/conf.d" in httpd.conf)
+#(an include directory, not a file, "Include /etc/apachew/conf.d" in httpd.conf)
 #deb (3.1+), 
-APACHE_CONF = /etc/apache/conf.d
+APACHE_CONF = /etc/apache2/conf.d
 
 FREESIDE_RESTART = ${INIT_FILE} restart
 
@@ -144,7 +145,7 @@ masondocs: httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/*
 alldocs: masondocs
 
 docs:
-	make ${TEMPLATE}docs
+	make masondocs
 
 wikiman:
 	chmod a+rx ./bin/pod2x
@@ -152,7 +153,7 @@ wikiman:
 
 install-docs: docs
 	[ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true
-	cp -r ${TEMPLATE}docs ${FREESIDE_DOCUMENT_ROOT}
+	cp -r masondocs ${FREESIDE_DOCUMENT_ROOT}
 	chown -R freeside:freeside ${FREESIDE_DOCUMENT_ROOT}
 	cp htetc/handler.pl ${MASON_HANDLER}
 	  perl -p -i -e "\
@@ -185,6 +186,7 @@ perl-modules:
 	" blib/lib/FS.pm;\
 	perl -p -i -e "\
 	  s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
+	  s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\
 	" blib/lib/FS/*.pm;\
 	perl -p -i -e "\
 	  s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
@@ -235,6 +237,7 @@ install-apache:
 	  ) || true
 
 install-selfservice:
+	[ -e ~freeside ] || cp -pr /etc/skel ~freeside && chown -R freeside ~freeside
 	[ -e ~freeside/.ssh/id_dsa.pub ] || su - freeside -c 'ssh-keygen -t dsa'
 	for MACHINE in ${SELFSERVICE_MACHINES}; do \
 	  scp -r fs_selfservice/FS-SelfService ${SELFSERVICE_INSTALL_USER}@$$MACHINE:. ;\
@@ -298,7 +301,7 @@ configure-rt:
 	  s'%%%MASONDATA%%%'${MASONDATA}'g;\
 	" config.layout; \
 	./configure --enable-layout=Freeside\
-	            --with-db-type=Pg \
+	            --with-db-type=${DB_TYPE} \
 	            --with-db-dba=${DB_USER} \
 	            --with-db-database=${RT_DB_DATABASE} \
 	            --with-db-rt-user=${DB_USER} \
@@ -312,12 +315,9 @@ create-rt: configure-rt
 	[ -d /opt/rt3       ] || mkdir /opt/rt3       #
 	[ -d /opt/rt3/share ] || mkdir /opt/rt3/share #
 	cd rt; make install
-	echo -e "${DB_PASSWORD}\n\\d sessions"\
-	 | psql -U ${DB_USER} -W ${RT_DB_DATABASE} 2>&1\
-	 | grep '^Did not find'\
-	 && rt/sbin/rt-setup-database --dba '${DB_USER}' \
-	                             --dba-password '${DB_PASSWORD}' \
-	                             --action schema \
+	rt/sbin/rt-setup-database --dba '${DB_USER}' \
+	                          -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 \