ACLs: finish group edit (agents + rights) & browse
[freeside.git] / Makefile
index e63f799..421e9e3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -41,10 +41,8 @@ INIT_INSTALL = /usr/sbin/update-rc.d freeside defaults 21 20
 #not necessary (freebsd)
 #INIT_INSTALL = /usr/bin/true
 
-#deb
-HTTPD_RESTART = /etc/init.d/apache reload
-#suse
-#HTTPD_RESTART = /etc/init.d/apache restart
+#deb, suse
+HTTPD_RESTART = /etc/init.d/apache restart
 #redhat, fedora, mandrake
 #HTTPD_RESTART = /etc/init.d/httpd restart
 #freebsd
@@ -69,9 +67,6 @@ INSTALLGROUP = root
 
 QUEUED_USER=fs_queue
 
-#eventually this shouldn't be needed
-FREESIDE_PATH = `pwd`
-
 SELFSERVICE_USER = fs_selfservice
 #never run on the same machine in production!!!
 SELFSERVICE_MACHINES = localhost
@@ -84,11 +79,11 @@ 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;
+RT_TIMEZONE = US/Pacific
+#RT_TIMEZONE = US/Eastern
 FREESIDE_URL = "http://localhost/freeside/"
 
 #for now, same db as specified in DATASOURCE... eventually, otherwise?
@@ -101,17 +96,32 @@ FREESIDE_CONF = /usr/local/etc/freeside
 #rt/config.layout.in
 RT_PATH = /opt/rt3
 
-VERSION=1.5.7
-TAG=freeside_1_5_7
+#only used for dev kludge now, not a big deal
+FREESIDE_PATH = `pwd`
+PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.8.8/
+
+VERSION=1.7.0
+TAG=freeside_1_7_0
 
 help:
-       @echo "supported targets: aspdocs masondocs alldocs docs install-docs"
-       @echo "                   htmlman"
-       @echo "                   perl-modules install-perl-modules"
+       @echo "supported targets:"
+       @echo "                   create-database create-config"
        @echo "                   install deploy"
-       @echo "                   create-database"
        @echo "                   configure-rt create-rt"
-       @echo "                   clean"
+       @echo "                   clean help"
+       @echo
+       @echo "                   install-docs install-perl-modules"
+       @echo "                   install-init install-apache"
+       @echo "                   install-rt"
+       @echo "                   install-selfservice update-selfservice"
+       @echo
+       @echo "                   dev dev-docs dev-perl-modules"
+       @echo
+       @echo "                   aspdocs masondocs alldocs docs"
+       @echo "                   htmlman forcehtmlman"
+       @echo "                   perl-modules"
+       #@echo
+       #@echo "                   upload-docs release update-webdemo"
 
 aspdocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
        rm -rf aspdocs
@@ -168,24 +178,50 @@ install-docs: docs
        [ "${TEMPLATE}" = "mason" -a ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
        [ "${TEMPLATE}" = "mason" ] && chown -R freeside ${MASONDATA} || true
 
+dev-docs: docs
+       [ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true
+       ln -s ${FREESIDE_PATH}/masondocs ${FREESIDE_DOCUMENT_ROOT}
+       cp htetc/handler.pl ${MASON_HANDLER}
+       perl -p -i -e "\
+         s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
+         s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \
+         s'###use Module::Refresh;###'use Module::Refresh;'; \
+         s'###Module::Refresh->refresh;###'Module::Refresh->refresh;'; \
+       " ${MASON_HANDLER} || true
+
+
 perl-modules:
        cd FS; \
        [ -e Makefile ] || perl Makefile.PL; \
        make; \
        perl -p -i -e "\
          s/%%%VERSION%%%/${VERSION}/g;\
-       " blib/lib/FS.pm
+       " blib/lib/FS.pm; \
+       perl -p -i -e "\
+         s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
+       " blib/lib/FS/CGI.pm
 
 install-perl-modules: perl-modules
+       [ -L ${PERL_INC_DEV_KLUDGE}/FS ] \
+         && rm ${PERL_INC_DEV_KLUDGE}/FS \
+         && mv ${PERL_INC_DEV_KLUDGE}/FS.old ${PERL_INC_DEV_KLUDGE}/FS \
+         || true
        cd FS; \
        make install UNINST=1
 
+dev-perl-modules: perl-modules
+       [ -d ${PERL_INC_DEV_KLUDGE}/FS -a ! -L ${PERL_INC_DEV_KLUDGE}/FS ] \
+         && mv ${PERL_INC_DEV_KLUDGE}/FS ${PERL_INC_DEV_KLUDGE}/FS.old \
+         || true
+
+       rm -rf ${PERL_INC_DEV_KLUDGE}/FS
+       ln -sf ${FREESIDE_PATH}/FS/blib/lib/FS ${PERL_INC_DEV_KLUDGE}/FS
+
 install-init:
        #[ -e ${INIT_FILE} ] || install -o root -g ${INSTALLGROUP} -m 711 init.d/freeside-init ${INIT_FILE}
        install -o root -g ${INSTALLGROUP} -m 711 init.d/freeside-init ${INIT_FILE}
        perl -p -i -e "\
          s/%%%QUEUED_USER%%%/${QUEUED_USER}/g;\
-         s'%%%FREESIDE_PATH%%%'${FREESIDE_PATH}'g;\
          s/%%%SELFSERVICE_USER%%%/${SELFSERVICE_USER}/g;\
          s/%%%SELFSERVICE_MACHINES%%%/${SELFSERVICE_MACHINES}/g;\
        " ${INIT_FILE}
@@ -207,7 +243,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
 
@@ -224,6 +261,8 @@ deploy: install
        ${HTTPD_RESTART}
        ${FREESIDE_RESTART}
 
+dev: dev-perl-modules dev-docs
+
 create-database:
        perl -e 'use DBIx::DataSource qw( create_database ); create_database( "${DATASOURCE}", "${DB_USER}", "${DB_PASSWORD}" ) or die $$DBIx::DataSource::errstr;'
 
@@ -306,7 +345,8 @@ upload-docs: forcehtmlman
        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
+#release: upload-docs
+release:
        cd /home/ivan/freeside
        #cvs tag ${TAG}
        cvs tag -F ${TAG}