projects / freeside.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
backport fix from 1.5 for "can't declare scalar assignment in my" error
[freeside.git] / Makefile
diff --git a/Makefile b/Makefile
index bf5b73e..0d88cf9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,30 +13,40 @@ ASP_GLOBAL = /usr/local/etc/freeside/asp-global
 MASON_HANDLER = /usr/local/etc/freeside/handler.pl
 MASONDATA = /usr/local/etc/freeside/masondata
 
-#deb, others?
+#deb
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
+#redhat, fedora, mandrake
+#FREESIDE_DOCUMENT_ROOT = /var/www/html/freeside
 #freebsd
 #FREESIDE_DOCUMENT_ROOT = /usr/local/www/data/freeside
 #openbsd
 #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, 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, others?
+#deb, suse
 HTTPD_RESTART = /etc/init.d/apache restart
+#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, others?
+#deb, redhat, fedora, mandrake, suse, others?
 INSTALLGROUP = root
-#freebsd,openbsd
+#freebsd, openbsd
 #INSTALLGROUP = wheel
 
 #edit the stuff below to have the daemons start
@@ -46,24 +56,25 @@ QUEUED_USER=fs_queue
 #eventually this shouldn't be needed
 FREESIDE_PATH = `pwd`
 
-PASSWD_USER = nostart
-PASSWD_MACHINE = localhost
-
-SIGNUP_USER = nostart
-SIGNUP_MACHINE = localhost
-SIGNUP_AGENTNUM = 2
-SIGNUP_REFNUM = 2
-
 SELFSERVICE_USER = fs_selfservice
-SELFSERVICE_MACHINE = localhost
+#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.2
+TAG=freeside_1_4_2
 
 help:
        @echo "supported targets: aspdocs masondocs alldocs docs install-docs"
@@ -122,6 +133,10 @@ install-docs: docs
        [ "${TEMPLATE}" = "asp" ] && chown -R freeside ${ASP_GLOBAL} || true
        [ "${TEMPLATE}" = "asp" ] && cp htetc/global.asa ${ASP_GLOBAL} || true
        [ "${TEMPLATE}" = "mason" ] && cp htetc/handler.pl ${MASON_HANDLER} || true
+       [ "${TEMPLATE}" = "mason" ] && \
+         perl -p -i -e "\
+           s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
+         " ${MASON_HANDLER} || true
        [ "${TEMPLATE}" = "mason" -a ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
        [ "${TEMPLATE}" = "mason" ] && chown -R freeside ${MASONDATA} || true
 
@@ -140,16 +155,28 @@ install-init:
        perl -p -i -e "\
          s/%%%QUEUED_USER%%%/${QUEUED_USER}/g;\
          s'%%%FREESIDE_PATH%%%'${FREESIDE_PATH}'g;\
-         s/%%%PASSWD_USER%%%/${PASSWD_USER}/g;\
-         s/%%%PASSWD_MACHINE%%%/${PASSWD_MACHINE}/g;\
-         s/%%%SIGNUP_USER%%%/${SIGNUP_USER}/g;\
-         s/%%%SIGNUP_MACHINE%%%/${SIGNUP_MACHINE}/g;\
-         s/%%%SIGNUP_AGENTNUM%%%/${SIGNUP_AGENTNUM}/g;\
-         s/%%%SIGNUP_REFNUM%%%/${SIGNUP_REFNUM}/g;\
          s/%%%SELFSERVICE_USER%%%/${SELFSERVICE_USER}/g;\
-         s/%%%SELFSERVICE_MACHINE%%%/${SELFSERVICE_MACHINE}/g;\
+         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
@@ -161,8 +188,7 @@ create-database:
 
 create-config: install-perl-modules
        [ -e ${FREESIDE_CONF} ] && mv ${FREESIDE_CONF} ${FREESIDE_CONF}.`date +%Y%m%d%H%M%S` || true
-       mkdir ${FREESIDE_CONF}
-       chown freeside ${FREESIDE_CONF}
+       install -d -o freeside ${FREESIDE_CONF}
 
        touch ${FREESIDE_CONF}/secrets
        chown freeside ${FREESIDE_CONF}/secrets
@@ -174,7 +200,8 @@ create-config: install-perl-modules
 
        mkdir "${FREESIDE_CONF}/conf.${DATASOURCE}"
        rm -rf conf/registries #old dirs just won't go away
-       cp conf/[a-z]* "${FREESIDE_CONF}/conf.${DATASOURCE}"
+       #cp conf/[a-z]* "${FREESIDE_CONF}/conf.${DATASOURCE}"
+       cp `ls -d conf/[a-z]* | grep -v CVS` "${FREESIDE_CONF}/conf.${DATASOURCE}"
        chown -R freeside "${FREESIDE_CONF}/conf.${DATASOURCE}"
 
        mkdir "${FREESIDE_CONF}/counters.${DATASOURCE}"
@@ -193,12 +220,14 @@ 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
+#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}
 
@@ -206,11 +235,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@cleanwhisker.420.am:/var/www/sisd.420.am/freeside/
+       scp freeside-${VERSION}.tar.gz ivan@420.am:/var/www/sisd.420.am/freeside/
        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 )'
 
Freeside billing, trouble ticketing, network monitoring and provisioning