dist fixes. locate more stuff in Makefile. whew.

diff --git a/Makefile b/Makefile
index 48b7d7d..0f7ff71 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,21 @@ FREESIDE_RESTART = /etc/init.d/freeside restart
 
 INSTALLGROUP = root
 
 
 INSTALLGROUP = root
 

+#edit the stuff below to have the daemons start
+
+QUEUED_USER=ivan
+
+#eventually this shouldn't be needed
+FREESIDE_PATH = `pwd`
+
+PASSWD_USER = ivan
+PASSWD_MACHINE = localhost
+
+SIGNUP_USER = ivan
+SIGNUP_MACHINE = localhost
+SIGNUP_AGENTNUM = 2
+SIGNUP_REFNUM = 2
+

 #---
 
 #not changable yet
 #---
 
 #not changable yet


@@ -83,6 +98,16 @@ install-perl-modules: perl-modules
 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}
 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/%%%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;\
+       " ${INIT_FILE}

 
 install: install-perl-modules install-docs install-init
 
 
 install: install-perl-modules install-docs install-init
 

diff --git a/init.d/freeside-init b/init.d/freeside-init
index 46f133d..d3016b2 100644 (file)
--- a/init.d/freeside-init
+++ b/init.d/freeside-init
@@ -3,17 +3,17 @@
 # chkconfig: 345 86 16
 # description: Freeside daemons
 
 # chkconfig: 345 86 16
 # description: Freeside daemons
 

-QUEUED_USER=ivan
+QUEUED_USER=%%%QUEUED_USER%%%

 
 

-FREESIDE_PATH="/home/ivan/freeside_current"
+FREESIDE_PATH="%%%FREESIDE_PATH%%%"

 
 

-PASSWD_USER=ivan
-PASSWD_MACHINE=localhost
+PASSWD_USER=%%%PASSWD_USER%%%
+PASSWD_MACHINE=%%%PASSWD_MACHINE%%%

 
 

-SIGNUP_USER=ivan
-SIGNUP_MACHINE=localhost
-SIGNUP_AGENTNUM=2
-SIGNUP_REFNUM=2
+SIGNUP_USER=%%%SIGNUP_USER%%%
+SIGNUP_MACHINE=%%%SIGNUP_MACHINE%%%
+SIGNUP_AGENTNUM=%%%SIGNUP_AGENTNUM%%%
+SIGNUP_REFNUM=%%%SIGNUP_REFNUM%%%

 
 case "$1" in
   start)
 
 case "$1" in
   start)