X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=d70601360d6ec4cfa95d0185c2b7a998bf642971;hp=3b0035268352a4e705ecc347aa7645fde83a05f1;hb=584caeef2ac90ab10fc028a7928b9ebc53e8b33a;hpb=b7886437ea53a9984c59832a0194fa7e31aa0895 diff --git a/Makefile b/Makefile index 3b0035268..d70601360 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,8 @@ #!/usr/bin/make +#solaris and perhaps other very weirdass /bin/sh +#SHELL="/bin/ksh" + DATASOURCE = DBI:Pg:dbname=freeside #DATASOURCE=DBI:mysql:freeside @@ -31,16 +34,23 @@ INIT_FILE = /etc/init.d/freeside #freebsd #INIT_FILE = /usr/local/etc/rc.d/011.freeside.sh +#deb +INIT_INSTALL = /usr/sbin/update-rc.d freeside defaults 21 20 +#redhat, fedora +#INIT_INSTALL = /sbin/chkconfig freeside on +#not necessary (freebsd) +#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 1; /usr/local/etc/rc.d/apache.sh start +#HTTPD_RESTART = /usr/local/etc/rc.d/apache.sh stop; sleep 10; /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 +#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 restart +#HTTPD_RESTART = /usr/local/apache/bin/apachectl stop; sleep 10; /usr/local/apache/bin/apachectl startssl FREESIDE_RESTART = ${INIT_FILE} restart @@ -57,14 +67,16 @@ 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 #user with sudo access on SELFSERVICE_MACHINES for automated self-service #installation. SELFSERVICE_INSTALL_USER = ivan -SELFSERVICE_INSTALL_USERADD = useradd -#SELFSERVICE_INSTALL_USERADD = "pw useradd" +SELFSERVICE_INSTALL_USERADD = /usr/sbin/useradd +#SELFSERVICE_INSTALL_USERADD = "/usr/sbin/pw useradd" RT_ENABLED = 0 #RT_ENABLED = 1 @@ -72,6 +84,9 @@ RT_DOMAIN = example.com RT_TIMEZONE = US/Pacific; #RT_TIMEZONE = US/Eastern; +#for now, same db as specified in DATASOURCE... eventually, otherwise? +RT_DB_DATABASE = freeside + #--- #not changable yet @@ -79,8 +94,8 @@ 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.5.0pre6 +TAG=freeside_1_5_0pre6 help: @echo "supported targets: aspdocs masondocs alldocs docs install-docs" @@ -94,9 +109,6 @@ help: aspdocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/* rm -rf aspdocs cp -pr httemplate aspdocs - perl -p -i -e "\ - s/%%%VERSION%%%/${VERSION}/g;\ - " aspdocs/index.html touch aspdocs @@ -106,9 +118,6 @@ masondocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/* ( cd masondocs; \ ../bin/masonize; \ ) - perl -p -i -e "\ - s/%%%VERSION%%%/${VERSION}/g;\ - " masondocs/index.html touch masondocs alldocs: aspdocs masondocs @@ -155,7 +164,10 @@ install-docs: docs perl-modules: cd FS; \ [ -e Makefile ] || perl Makefile.PL; \ - make + make; \ + perl -p -i -e "\ + s/%%%VERSION%%%/${VERSION}/g;\ + " blib/lib/FS.pm install-perl-modules: perl-modules cd FS; \ @@ -170,6 +182,7 @@ install-init: s/%%%SELFSERVICE_USER%%%/${SELFSERVICE_USER}/g;\ s/%%%SELFSERVICE_MACHINES%%%/${SELFSERVICE_MACHINES}/g;\ " ${INIT_FILE} + ${INIT_INSTALL} install-selfservice: [ -e ~freeside/.ssh/id_dsa.pub ] || su -c 'ssh-keygen -t dsa' - freeside @@ -178,7 +191,15 @@ install-selfservice: 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 ${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_RSH=ssh 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 @@ -227,7 +248,7 @@ configure-rt: ./configure --enable-layout=Freeside\ --with-db-type=Pg \ --with-db-dba=${DB_USER} \ - --with-db-database=freeside \ + --with-db-database=${RT_DB_DATABASE} \ --with-db-rt-user=${DB_USER} \ --with-db-rt-pass=${DB_PASSWORD} \ --with-web-user=freeside \ @@ -235,9 +256,12 @@ configure-rt: --with-rt-group=freeside create-rt: configure-rt + [ -d /opt ] || mkdir /opt #doh + [ -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 freeside 2>&1\ + | 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}' \ @@ -262,8 +286,8 @@ 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 + 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