Acceptance testing of the RPM build system flushed out a place where /bin/rm

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index 5d68cbc..43f6422 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -85,7 +85,7 @@ QUEUED_USER=fs_queue
 
 SELFSERVICE_USER = fs_selfservice
 #never run on the same machine in production!!!
-SELFSERVICE_MACHINES = localhost
+SELFSERVICE_MACHINES = 
 # SELFSERVICE_MACHINES = www.example.com
 # SELFSERVICE_MACHINES = web1.example.com web2.example.com
 
@@ -192,11 +192,16 @@ perl-modules:
        " blib/lib/FS.pm;\
        perl -p -i -e "\
          s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
+         s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\
        " blib/lib/FS/*.pm;\
        perl -p -i -e "\
          s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
        " blib/lib/FS/part_export/*.pm;\
        perl -p -i -e "\
+         s/%%%SELFSERVICE_USER%%%/${SELFSERVICE_USER}/g;\
+         s/%%%SELFSERVICE_MACHINES%%%/${SELFSERVICE_MACHINES}/g;\
+       " blib/lib/FS/Cron/*.pm;\
+       perl -p -i -e "\
          s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
          s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\
          s|%%%FREESIDE_LOCK%%%|${FREESIDE_LOCK}|g;\
@@ -244,7 +249,7 @@ install-apache:
 
 install-selfservice:
        [ -e ~freeside ] || cp -pr /etc/skel ~freeside && chown -R freeside ~freeside
-       [ -e ~freeside/.ssh/id_dsa.pub ] || su - freeside -c 'ssh-keygen -t dsa'
+       [ -e ~freeside/.ssh/id_dsa.pub ] || [ -e ~freeside/.ssh/id_rsa.pub ] || su - freeside -c 'ssh-keygen -t dsa'
        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" ;\