clean up existing packages when changing supplemental package defs, #31194

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index 010678f..aed4945 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -79,6 +79,7 @@ INSTALLGROUP = root
 #edit the stuff below to have the daemons start
 
 QUEUED_USER=fs_queue
+API_USER = fs_api
 
 SELFSERVICE_USER = fs_selfservice
 #never run on the same machine in production!!!
@@ -164,11 +165,15 @@ wikiman:
        chmod a+rx ./bin/pod2x
        ./bin/pod2x
 
-install-docs: check-conflicts docs
-       [ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true
-       cp -r masondocs ${FREESIDE_DOCUMENT_ROOT}
+install-docs: docs
+       #ancient attempt to avoid overwriting customer modifications directly to production web files that's overlived its usefulness
+       #[ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true
+       #cp -r masondocs ${FREESIDE_DOCUMENT_ROOT}
+       [ -h ${FREESIDE_DOCUMENT_ROOT} ] && rm ${FREESIDE_DOCUMENT_ROOT} || true
+       mkdir -p ${FREESIDE_DOCUMENT_ROOT}
+       cp -r masondocs/* masondocs/.htaccess ${FREESIDE_DOCUMENT_ROOT}
        chown -R freeside:freeside ${FREESIDE_DOCUMENT_ROOT}
-       cp htetc/handler.pl ${MASON_HANDLER}
+       install -D htetc/handler.pl ${MASON_HANDLER}
        perl -p -i -e "\
          s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
          s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \
@@ -217,6 +222,9 @@ perl-modules:
          s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\
        " blib/lib/FS/cust_main/*.pm blib/lib/FS/cust_pkg/*.pm;\
        perl -p -i -e "\
+         s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\
+       " blib/lib/FS/Daemon/*.pm;\
+       perl -p -i -e "\
          s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
          s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\
          s|%%%FREESIDE_LOCK%%%|${FREESIDE_LOCK}|g;\
@@ -225,7 +233,7 @@ perl-modules:
          s|%%%DIST_CONF%%%|${DIST_CONF}|g;\
        " blib/script/*
 
-install-perl-modules: check-conflicts perl-modules install-rt-initialdata
+install-perl-modules: perl-modules install-rt-initialdata
        [ -L ${PERL_INC_DEV_KLUDGE}/FS ] \
          && rm ${PERL_INC_DEV_KLUDGE}/FS \
          && mv ${PERL_INC_DEV_KLUDGE}/FS.old ${PERL_INC_DEV_KLUDGE}/FS \
@@ -256,6 +264,7 @@ install-init:
        install -o root -g ${INSTALLGROUP} -m 711 init.d/freeside-init ${INIT_FILE}
        perl -p -i -e "\
          s/%%%QUEUED_USER%%%/${QUEUED_USER}/g;\
+         s/%%%API_USER%%%/${API_USER}/g;\
          s/%%%SELFSERVICE_USER%%%/${SELFSERVICE_USER}/g;\
          s/%%%SELFSERVICE_MACHINES%%%/${SELFSERVICE_MACHINES}/g;\
        " ${INIT_FILE}
@@ -277,13 +286,13 @@ install-apache:
 
 install-selfservice:
        [ -e ~freeside ] || cp -pr /etc/skel ~freeside && chown -R freeside ~freeside
-       [ -e ~freeside/.ssh/id_dsa.pub ] || [ -e ~freeside/.ssh/id_rsa.pub ] || su - freeside -c 'ssh-keygen -t dsa'
+       [ -e ~freeside/.ssh/id_rsa.pub ] || su - freeside -c 'ssh-keygen'
        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 ~freeside/.ssh/; sudo install -o freeside -m 600 ./id_dsa.pub ~freeside/.ssh/authorized_keys" ;\
+         scp ~freeside/.ssh/id_rsa.pub ${SELFSERVICE_INSTALL_USER}@$$MACHINE:. ;\
+         ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo ${SELFSERVICE_INSTALL_USERADD} freeside; sudo install -d -o freeside -m 755 ~freeside/.ssh/; sudo install -o freeside -m 600 ./id_rsa.pub ~freeside/.ssh/authorized_keys" ;\
           ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "sudo install -o freeside -d /usr/local/freeside" ;\
        done
 
@@ -372,7 +381,7 @@ create-rt: configure-rt
                                     --datafile ${RT_PATH}/etc/initialdata \
        || true
 
-install-rt: check-conflicts
+install-rt: 
        if [ ${RT_ENABLED} -eq 1 ]; then ( cd rt; make install ); fi
        if [ ${RT_ENABLED} -eq 1 ]; then perl -p -i -e "\
          s'%%%RT_DOMAIN%%%'${RT_DOMAIN}'g;\
@@ -412,9 +421,6 @@ clean:
        -cd fs_selfservice/FS-SelfService; \
        make clean
 
-check-conflicts:
-       ! grep -r --exclude='*config.log*' '--exclude=*config.status*' --exclude=gnupg_details_on_output_formats '--exclude=*mason_handler*' '^=======$$' .
-
 #these are probably only useful if you're me...
 
 #release: upload-docs