X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=0d88cf928f7bf0de29e9b41708160cb55d399c0e;hb=refs%2Fheads%2FFREESIDE_1_4_BRANCH;hp=ac990662389cf3a618d92ce50f0aa1987b3c7e87;hpb=78d47fb5d3a52de488d0b211293f253418ba494b;p=freeside.git diff --git a/Makefile b/Makefile index ac9906623..0d88cf928 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ HTTPD_RESTART = /etc/init.d/apache restart #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 +#HTTPD_RESTART = /usr/local/apache/bin/apachectl stop; sleep 10; /usr/local/apache/bin/apachectl startssl FREESIDE_RESTART = ${INIT_FILE} restart @@ -57,22 +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 #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" #--- #not changable yet FREESIDE_CONF = /usr/local/etc/freeside -VERSION=1.4.2beta1 -TAG=freeside_1_4_2beta1 +VERSION=1.4.2 +TAG=freeside_1_4_2 help: @echo "supported targets: aspdocs masondocs alldocs docs install-docs" @@ -160,11 +162,20 @@ install-init: 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" + 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 @@ -209,12 +220,13 @@ 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/docs - scp -pr httemplate/docs pouncequick.420.am:/var/www/www.sisd.com/freeside/docs +#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 update-webdemo -release: upload-docs +release: cd /home/ivan/freeside1.4 #cvs tag ${TAG} cvs tag -F ${TAG} @@ -223,7 +235,7 @@ 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: