X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=071cedc9c7ec1037b4d41c9e0441b40c6005ec4f;hb=c40e3c171c9ca3cda8f35df2975c476b9102bac9;hp=bce1d61450f18343d4bad92f545bb6fde005e2af;hpb=8be4f17f8bda91fdf61a5f22314a04ba23e8f489;p=freeside.git diff --git a/Makefile b/Makefile index bce1d6145..071cedc9c 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,16 +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 = /usr/sbin/useradd +#SELFSERVICE_INSTALL_USERADD = "/usr/sbin/pw useradd" + #--- #not changable yet FREESIDE_CONF = /usr/local/etc/freeside -VERSION=1.5.0pre4 -TAG=freeside_1_5_0pre4 +VERSION=1.4.2beta1 +TAG=freeside_1_4_2beta1 help: @echo "supported targets: aspdocs masondocs alldocs docs install-docs" @@ -70,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/*/*/*/*/* @@ -148,6 +159,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 deploy: install @@ -184,28 +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;\ - " config.layout; \ - ./configure --with-layout=Freeside\ - --masonstatedir=${MASONDATA} \ - --with-db-type=Pg \ - --with-db-database=freeside \ - --with-db-rt-user=${DB_USER} \ - --with-db-rt-pass=${DB_PASSWORD} \ - --with-web-user=freeside \ - --with-web-group=www - -create-rt: configure-rt - cd rt; make install - rt/sbin/rt-initialize-database --action schema - rt/sbin/rt-initialize-database --action insert_initial - rt/sbin/rt-initialize-database --action insert --datafile rt/etc/initialdata - - clean: rm -rf aspdocs masondocs cd FS; \ @@ -213,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} @@ -230,7 +239,7 @@ release: upload-docs 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 )'