diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 32 |
1 files changed, 10 insertions, 22 deletions
@@ -13,31 +13,18 @@ ASP_GLOBAL = /usr/local/etc/freeside/asp-global MASON_HANDLER = /usr/local/etc/freeside/handler.pl MASONDATA = /usr/local/etc/freeside/masondata -#deb, others? FREESIDE_DOCUMENT_ROOT = /var/www/freeside -#freebsd -#FREESIDE_DOCUMENT_ROOT = /usr/local/www/data/freeside -#deb, others? INIT_FILE = /etc/init.d/freeside -#freebsd -#INIT_FILE = /usr/local/etc/rc.d/011.freeside.sh -#deb, others? HTTPD_RESTART = /etc/init.d/apache restart -#freebsd -#HTTPD_RESTART = /usr/local/etc/rc.d/apache.sh stop; sleep 1; /usr/local/etc/rc.d/apache.sh start +FREESIDE_RESTART = /etc/init.d/freeside restart -FREESIDE_RESTART = ${INIT_FILE} restart - -#deb, others? INSTALLGROUP = root -#freebsd -#INSTALLGROUP = wheel #edit the stuff below to have the daemons start -QUEUED_USER=fs_queue +QUEUED_USER=ivan #eventually this shouldn't be needed FREESIDE_PATH = `pwd` @@ -50,7 +37,7 @@ SIGNUP_MACHINE = localhost SIGNUP_AGENTNUM = 2 SIGNUP_REFNUM = 2 -SELFSERVICE_USER = fs_selfservice +SELFSERVICE_USER = nostart SELFSERVICE_MACHINE = localhost #--- @@ -58,8 +45,8 @@ SELFSERVICE_MACHINE = localhost #not changable yet FREESIDE_CONF = /usr/local/etc/freeside -VERSION=1.5.0pre1 -TAG=freeside_1_5_0pre1 +VERSION=1.4.1rc2 +TAG=freeside_1_4_1rc2 help: @echo "supported targets: aspdocs masondocs alldocs docs install-docs" @@ -190,11 +177,12 @@ clean: #these are probably only useful if you're me... upload-docs: forcehtmlman - ssh cleanwhisker.420.am rm -rf /var/www/www.sisd.com/freeside/devdocs - scp -pr httemplate/docs cleanwhisker.420.am:/var/www/www.sisd.com/freeside/devdocs + ssh cleanwhisker.420.am rm -rf /var/www/www.sisd.com/freeside/docs + scp -pr httemplate/docs cleanwhisker.420.am:/var/www/www.sisd.com/freeside/docs +#release: upload-docs update-webdemo release: upload-docs - cd /home/ivan/freeside + cd /home/ivan/freeside1.4 #cvs tag ${TAG} cvs tag -F ${TAG} @@ -206,7 +194,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 )' |