X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=ef34915d2c68c1cd957662ac720f96bd9d99e38f;hp=70e588218908822e93e15ff7b605e9ee9c4212ba;hb=f2e9d8413d6178a6248c8b5d47ac06b1d1f12cb5;hpb=ce41102169513f44c89a1e9bddfb250b29f239bb

diff --git a/Makefile b/Makefile
index 70e588218..ef34915d2 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 restart
 
 FREESIDE_RESTART = ${INIT_FILE} restart
 
-#deb, redhat, mandrake, suse, others?
+#deb, redhat, fedora, mandrake, suse, others?
 INSTALLGROUP = root
 #freebsd, openbsd
 #INSTALLGROUP = wheel
@@ -53,14 +57,22 @@ 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
+#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"
+
+RT_ENABLED = 0
+#RT_ENABLED = 1
 RT_DOMAIN = example.com
-RT_TIMEZONE = 'US/Pacific';
-#RT_TIMEZONE = 'US/Eastern';
+RT_TIMEZONE = US/Pacific;
+#RT_TIMEZONE = US/Eastern;
 
 #---
 
@@ -129,6 +141,10 @@ install-docs: docs
 	[ "${TEMPLATE}" = "asp" -a ! -e ${ASP_GLOBAL} ] && mkdir ${ASP_GLOBAL} || true
 	[ "${TEMPLATE}" = "asp" ] && chown -R freeside ${ASP_GLOBAL} || true
 	[ "${TEMPLATE}" = "asp" ] && cp htetc/global.asa ${ASP_GLOBAL} || true
+	[ "${TEMPLATE}" = "asp" ] && \
+	  perl -p -i -e "\
+	    s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
+	  " ${ASP_GLOBAL}/global.asa || true
 	[ "${TEMPLATE}" = "mason" ] && cp htetc/handler.pl ${MASON_HANDLER} || true
 	[ "${TEMPLATE}" = "mason" ] && \
 	  perl -p -i -e "\
@@ -157,6 +173,24 @@ install-init:
 	  s/%%%SELFSERVICE_MACHINES%%%/${SELFSERVICE_MACHINES}/g;\
 	" ${INIT_FILE}
 
+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 install-rt
 
 deploy: install
@@ -213,7 +247,7 @@ configure-rt:
 create-rt: configure-rt
 	cd rt; make install
 	echo -e "${DB_PASSWORD}\n\\d sessions"\
-	 | psql -UW ${DB_USER} freeside 2>&1\
+	 | psql -U ${DB_USER} -W freeside 2>&1\
 	 | grep '^Did not find'\
 	 && rt/sbin/rt-setup-database --dba '${DB_USER}' \
 	                             --dba-password '${DB_PASSWORD}' \
@@ -228,7 +262,7 @@ create-rt: configure-rt
 	" ${RT_PATH}/etc/RT_SiteConfig.pm
 
 install-rt:
-	[ ${RT_ENABLED} ] && cd rt; make install
+	[ ${RT_ENABLED} -eq 1 ] && ( cd rt; make install ) || true
 
 clean:
 	rm -rf aspdocs masondocs