add native Radiator export

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index 8fa09d6..892872a 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
@@ -99,8 +101,8 @@ FREESIDE_CONF = /usr/local/etc/freeside
 #rt/config.layout.in
 RT_PATH = /opt/rt3
 
-VERSION=1.5.0pre6
-TAG=freeside_1_5_0pre6
+VERSION=1.5.8cvs
+TAG=freeside_1_5_8
 
 help:
        @echo "supported targets: aspdocs masondocs alldocs docs install-docs"
@@ -191,11 +193,12 @@ install-init:
 
 install-apache:
        [ -d ${APACHE_CONF} ] && \
-         install -o root -m 755 htetc/freeside-base.conf ${APACHE_CONF} && \
-         ( [ ${RT_ENABLED} -eq 1 ] && install -o root -m 755 htetc/freeside-rt.conf ${APACHE_CONF} || true ) && \
-         perl -p -i -e "\
-           s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
-         " ${APACHE_CONF}/freeside-*.conf
+         ( install -o root -m 755 htetc/freeside-base.conf ${APACHE_CONF} && \
+           ( [ ${RT_ENABLED} -eq 1 ] && install -o root -m 755 htetc/freeside-rt.conf ${APACHE_CONF} || true ) && \
+           perl -p -i -e "\
+             s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
+           " ${APACHE_CONF}/freeside-*.conf \
+         ) || true
 
 install-selfservice:
        [ -e ~freeside/.ssh/id_dsa.pub ] || su - freeside -c 'ssh-keygen -t dsa'
@@ -204,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
 
@@ -300,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
@@ -312,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 )'