new server

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index 796bca8..e63f799 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -41,8 +41,10 @@ INIT_INSTALL = /usr/sbin/update-rc.d freeside defaults 21 20
 #not necessary (freebsd)
 #INIT_INSTALL = /usr/bin/true
 
-#deb, suse
-HTTPD_RESTART = /etc/init.d/apache restart
+#deb
+HTTPD_RESTART = /etc/init.d/apache reload
+#suse
+#HTTPD_RESTART = /etc/init.d/apache restart
 #redhat, fedora, mandrake
 #HTTPD_RESTART = /etc/init.d/httpd restart
 #freebsd
@@ -82,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;
@@ -301,8 +303,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
@@ -313,11 +315,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 )'