X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=0d88cf928f7bf0de29e9b41708160cb55d399c0e;hb=refs%2Fheads%2FFREESIDE_1_4_BRANCH;hp=8a9921040cc41b5d170ce1f194c33ba3a942d74d;hpb=4c4b4f8d7548e10b98a173de30e25174f7cd305a;p=freeside.git

diff --git a/Makefile b/Makefile
index 8a9921040..0d88cf928 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ MASONDATA = /usr/local/etc/freeside/masondata
 
 #deb
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
-#redhat, mandrake
+#redhat, fedora, mandrake
 #FREESIDE_DOCUMENT_ROOT = /var/www/html/freeside
 #freebsd
 #FREESIDE_DOCUMENT_ROOT = /usr/local/www/data/freeside
@@ -23,24 +23,28 @@ FREESIDE_DOCUMENT_ROOT = /var/www/freeside
 #FREESIDE_DOCUMENT_ROOT = /var/www/htdocs/freeside
 #suse
 #FREESIDE_DOCUMENT_ROOT = /srv/www/htdocs/freeside
+#apache
+#FREESIDE_DOCUMENT_ROOT = /usr/local/apache/htdocs/freeside
 
-#deb, redhat, mandrake, suse, others?
+#deb, redhat, fedora, mandrake, suse, others?
 INIT_FILE = /etc/init.d/freeside
 #freebsd
 #INIT_FILE = /usr/local/etc/rc.d/011.freeside.sh
 
 #deb, suse
 HTTPD_RESTART = /etc/init.d/apache restart
-#redhat, mandrake
+#redhat, fedora, mandrake
 #HTTPD_RESTART = /etc/init.d/httpd restart
 #freebsd
 #HTTPD_RESTART = /usr/local/etc/rc.d/apache.sh stop; sleep 1; /usr/local/etc/rc.d/apache.sh start
 #openbsd
 #HTTPD_RESTART = kill -TERM `cat /var/www/logs/httpd.pid`; sleep 1; /usr/sbin/httpd -u -DSSL
+#apache
+#HTTPD_RESTART = /usr/local/apache/bin/apachectl stop; sleep 10; /usr/local/apache/bin/apachectl startssl
 
 FREESIDE_RESTART = ${INIT_FILE} restart
 
-#deb, redhat, mandrake, suse, others?
+#deb, redhat, fedora, mandrake, suse, others?
 INSTALLGROUP = root
 #freebsd, openbsd
 #INSTALLGROUP = wheel
@@ -53,24 +57,24 @@ QUEUED_USER=fs_queue
 FREESIDE_PATH = `pwd`
 
 SELFSERVICE_USER = fs_selfservice
+#never run on the same machine in production!!!
 SELFSERVICE_MACHINES = localhost
+# SELFSERVICE_MACHINES = www.example.com
 # SELFSERVICE_MACHINES = web1.example.com web2.example.com
 
-RT_ENABLED = 0
-#RT_ENABLED = 1
-RT_DOMAIN = example.com
-RT_TIMEZONE = 'US/Pacific';
-#RT_TIMEZONE = 'US/Eastern';
+#user with sudo access on SELFSERVICE_MACHINES for automated self-service
+#installation.
+SELFSERVICE_INSTALL_USER = ivan
+SELFSERVICE_INSTALL_USERADD = /usr/sbin/useradd
+#SELFSERVICE_INSTALL_USERADD = "/usr/sbin/pw useradd"
 
 #---
 
 #not changable yet
 FREESIDE_CONF = /usr/local/etc/freeside
-#rt/config.layout.in
-RT_PATH = /opt/rt3
 
-VERSION=1.5.0pre4
-TAG=freeside_1_5_0pre4
+VERSION=1.4.2
+TAG=freeside_1_4_2
 
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
@@ -78,7 +82,6 @@ help:
 	@echo "                   perl-modules install-perl-modules"
 	@echo "                   install deploy"
 	@echo "                   create-database"
-	@echo "                   configure-rt create-rt"
 	@echo "                   clean"
 
 aspdocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
@@ -133,7 +136,6 @@ install-docs: docs
 	[ "${TEMPLATE}" = "mason" ] && \
 	  perl -p -i -e "\
 	    s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
-	    s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \
 	  " ${MASON_HANDLER} || true
 	[ "${TEMPLATE}" = "mason" -a ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
 	[ "${TEMPLATE}" = "mason" ] && chown -R freeside ${MASONDATA} || true
@@ -157,7 +159,25 @@ install-init:
 	  s/%%%SELFSERVICE_MACHINES%%%/${SELFSERVICE_MACHINES}/g;\
 	" ${INIT_FILE}
 
-install: install-perl-modules install-docs install-init install-rt
+install-selfservice:
+	[ -e ~freeside/.ssh/id_dsa.pub ] || su -c 'ssh-keygen -t dsa' - freeside
+	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" ;\
+	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; sudo make install" ;\
+	  scp ~freeside/.ssh/id_dsa.pub ${SELFSERVICE_INSTALL_USER}@$$MACHINE:. ;\
+	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo ${SELFSERVICE_INSTALL_USERADD} freeside; sudo install -D -o freeside -m 600 ./id_dsa.pub ~freeside/.ssh/authorized_keys" ;\
+	   ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo install -o freeside -d /usr/local/freeside" ;\
+	done
+
+update-selfservice:
+	for MACHINE in ${SELFSERVICE_MACHINES}; do \
+ 	  rsync -rlptz fs_selfservice/FS-SelfService/ ${SELFSERVICE_INSTALL_USER}@$$MACHINE:FS-SelfService ;\
+ 	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; perl Makefile.PL && make" ;\
+ 	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; sudo make install" ;\
+ 	done
+
+install: install-perl-modules install-docs install-init
 
 deploy: install
 	${HTTPD_RESTART}
@@ -193,43 +213,6 @@ create-config: install-perl-modules
 	mkdir "${FREESIDE_CONF}/export.${DATASOURCE}"
 	chown freeside "${FREESIDE_CONF}/export.${DATASOURCE}"
 
-configure-rt:
-	cd rt; \
-	cp config.layout.in config.layout; \
-	perl -p -i -e "\
-	  s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g;\
-	  s'%%%MASONDATA%%%'${MASONDATA}'g;\
-	" config.layout; \
-	./configure --enable-layout=Freeside\
-	            --with-db-type=Pg \
-	            --with-db-dba=${DB_USER} \
-	            --with-db-database=freeside \
-	            --with-db-rt-user=${DB_USER} \
-	            --with-db-rt-pass=${DB_PASSWORD} \
-	            --with-web-user=freeside \
-	            --with-web-group=freeside \
-	            --with-rt-group=freeside
-
-create-rt: configure-rt
-	cd rt; make install
-	echo -e "${DB_PASSWORD}\n\\d sessions"\
-	 | psql -UW ${DB_USER} freeside 2>&1\
-	 | grep '^Did not find'\
-	 && 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 \
-	|| true
-	perl -p -i -e "\
-	  s'%%%RT_DOMAIN%%%'${RT_DOMAIN}'g;\
-	  s'%%%RT_TIMEZONE%%%'${RT_TIMEZONE}'g;\
-	" ${RT_PATH}/etc/RT_SiteConfig.pm
-
-install-rt:
-	[ ${RT_ENABLED} ] && cd rt; make install
-
 clean:
 	rm -rf aspdocs masondocs
 	cd FS; \
@@ -237,12 +220,14 @@ clean:
 
 #these are probably only useful if you're me...
 
-upload-docs: forcehtmlman
-	ssh pouncequick.420.am rm -rf /var/www/www.sisd.com/freeside/devdocs
-	scp -pr httemplate/docs pouncequick.420.am:/var/www/www.sisd.com/freeside/devdocs
+#no more doc uploads from maintenance branch
+#upload-docs: forcehtmlman
+#	ssh pouncequick.420.am rm -rf /var/www/www.sisd.com/freeside/docs
+#	scp -pr httemplate/docs pouncequick.420.am:/var/www/www.sisd.com/freeside/docs
 
-release: upload-docs
-	cd /home/ivan/freeside
+#release: upload-docs update-webdemo
+release: 
+	cd /home/ivan/freeside1.4
 	#cvs tag ${TAG}
 	cvs tag -F ${TAG}
 
@@ -250,11 +235,11 @@ release: upload-docs
 	cvs export -r ${TAG} -d freeside-${VERSION} freeside
 	tar czvf freeside-${VERSION}.tar.gz freeside-${VERSION}
 
-	scp freeside-${VERSION}.tar.gz ivan@pouncequick.420.am:/var/www/sisd.420.am/freeside/
+	scp freeside-${VERSION}.tar.gz ivan@420.am:/var/www/sisd.420.am/freeside/
 	mv freeside-${VERSION} freeside-${VERSION}.tar.gz ..
 
 update-webdemo:
-	ssh ivan@pouncequick.420.am '( cd freeside; cvs update -d -P )'
+	ssh ivan@pouncequick.420.am '( cd freeside; cvs update -r FREESIDE_1_4_BRANCH -d -P )'
 	#ssh root@pouncequick.420.am '( cd /home/ivan/freeside; make clean; make deploy )'
 	ssh root@pouncequick.420.am '( cd /home/ivan/freeside; make deploy )'