X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=892872a537c34326f137c34197653ec04ac58251;hb=0186436eb38e70da0a015e49dab67cec5f1a3467;hp=7f4e02ad352f459ee78adf7e1a795e9432ff4ee3;hpb=6cc863d8b6ae6771a019c83c91be143842de17bf;p=freeside.git

diff --git a/Makefile b/Makefile
index 7f4e02ad3..892872a53 100644
--- a/Makefile
+++ b/Makefile
@@ -84,8 +84,8 @@ SELFSERVICE_INSTALL_USER = ivan
 SELFSERVICE_INSTALL_USERADD = /usr/sbin/useradd
 #SELFSERVICE_INSTALL_USERADD = "/usr/sbin/pw useradd"
 
-RT_ENABLED = 0
-#RT_ENABLED = 1
+#RT_ENABLED = 0
+RT_ENABLED = 1
 RT_DOMAIN = example.com
 RT_TIMEZONE = US/Pacific;
 #RT_TIMEZONE = US/Eastern;
@@ -101,8 +101,8 @@ FREESIDE_CONF = /usr/local/etc/freeside
 #rt/config.layout.in
 RT_PATH = /opt/rt3
 
-VERSION=1.5.7
-TAG=freeside_1_5_7
+VERSION=1.5.8cvs
+TAG=freeside_1_5_8
 
 help:
 	@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
@@ -207,7 +207,8 @@ 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 ~freeside/.ssh/" ;\
+	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo ${SELFSERVICE_INSTALL_USERADD} freeside; sudo install -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
 
@@ -303,8 +304,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/docs
-	scp -pr httemplate/docs pouncequick.420.am:/var/www/www.sisd.com/freeside/docs
+	ssh 420.am rm -rf /var/www/www.sisd.com/freeside/docs
+	scp -pr httemplate/docs 420.am:/var/www/www.sisd.com/freeside/docs
 
 release: upload-docs
 	cd /home/ivan/freeside
@@ -315,11 +316,11 @@ 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/www.sisd.com/freeside/
 	mv freeside-${VERSION} freeside-${VERSION}.tar.gz ..
 
 update-webdemo:
-	ssh ivan@pouncequick.420.am '( cd freeside; cvs update -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 )'
+	ssh ivan@420.am '( cd freeside; cvs update -d -P )'
+	#ssh root@420.am '( cd /home/ivan/freeside; make clean; make deploy )'
+	ssh root@420.am '( cd /home/ivan/freeside; make deploy )'