X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=79491e9403a23286a2c6b3d74d4c8b1d6ef6571f;hp=de22d4233094aaec3532a61564fbb3b4d8ab5ad0;hb=c2146ae32fdef80049abfa13098db2d45f3ebdd5;hpb=7e393bf077b6952b75f4470e8fe8d6388c17976c

diff --git a/Makefile b/Makefile
index de22d4233..79491e940 100644
--- a/Makefile
+++ b/Makefile
@@ -35,23 +35,27 @@ INIT_FILE = /etc/init.d/freeside
 #INIT_FILE = /usr/local/etc/rc.d/011.freeside.sh
 
 #deb
-INIT_INSTALL = "/usr/sbin/update-rc.d freeside defaults 21 20"
+INIT_INSTALL = /usr/sbin/update-rc.d freeside defaults 21 20
 #redhat, fedora
-#INIT_INSTALL = "/sbin/chkconfig freeside"
+#INIT_INSTALL = /sbin/chkconfig freeside on
 #not necessary (freebsd)
-#INIT_INSTALL = "/bin/true"
+#INIT_INSTALL = /usr/bin/true
 
 #deb, suse
 HTTPD_RESTART = /etc/init.d/apache restart
 #redhat, fedora, mandrake
 #HTTPD_RESTART = /etc/init.d/httpd restart
 #freebsd
-#HTTPD_RESTART = /usr/local/etc/rc.d/apache.sh stop; sleep 10; /usr/local/etc/rc.d/apache.sh start
+#HTTPD_RESTART = /usr/local/etc/rc.d/apache.sh stop || true; sleep 10; /usr/local/etc/rc.d/apache.sh start
 #openbsd
 #HTTPD_RESTART = kill -TERM `cat /var/www/logs/httpd.pid`; sleep 10; /usr/sbin/httpd -u -DSSL
 #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)
+#deb (3.1+), 
+APACHE_CONF = /etc/apache/conf.d
+
 FREESIDE_RESTART = ${INIT_FILE} restart
 
 #deb, redhat, fedora, mandrake, suse, others?
@@ -83,6 +87,7 @@ RT_ENABLED = 0
 RT_DOMAIN = example.com
 RT_TIMEZONE = US/Pacific;
 #RT_TIMEZONE = US/Eastern;
+FREESIDE_URL = "http://localhost/freeside/"
 
 #for now, same db as specified in DATASOURCE... eventually, otherwise?
 RT_DB_DATABASE = freeside
@@ -184,8 +189,17 @@ install-init:
 	" ${INIT_FILE}
 	${INIT_INSTALL}
 
+install-apache:
+	[ -d ${APACHE_CONF} ] && \
+	  ( install -o root -m 755 htetc/freeside-base.conf ${APACHE_CONF} && \
+	    ( [ ${RT_ENABLED} -eq 1 ] && install -o root -m 755 htetc/freeside-rt.conf ${APACHE_CONF} || true ) && \
+	    perl -p -i -e "\
+	      s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
+	    " ${APACHE_CONF}/freeside-*.conf \
+	  ) || true
+
 install-selfservice:
-	[ -e ~freeside/.ssh/id_dsa.pub ] || su -c 'ssh-keygen -t dsa' - 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:. ;\
 	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; perl Makefile.PL && make" ;\
@@ -202,7 +216,7 @@ update-selfservice:
 	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; sudo make install" ;\
 	done
 
-install: install-perl-modules install-docs install-init install-rt
+install: install-perl-modules install-docs install-init install-apache install-rt
 
 deploy: install
 	${HTTPD_RESTART}
@@ -273,6 +287,7 @@ create-rt: configure-rt
 	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
 
 install-rt: