From: ivan <ivan>
Date: Sat, 5 Jun 2004 11:47:39 +0000 (+0000)
Subject: fix path and make var substitution
X-Git-Tag: BEFORE_FINAL_MASONIZE~1049
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=2adf848ec4e42200382ce0f028a31cefa98c3c39;ds=sidebyside

fix path and make var substitution
---

diff --git a/Makefile b/Makefile
index 3b0035268..c9e920ba5 100644
--- a/Makefile
+++ b/Makefile
@@ -63,8 +63,8 @@ SELFSERVICE_USER = fs_selfservice
 #user with sudo access on SELFSERVICE_MACHINES for automated self-service
 #installation.
 SELFSERVICE_INSTALL_USER = ivan
-SELFSERVICE_INSTALL_USERADD = useradd
-#SELFSERVICE_INSTALL_USERADD = "pw useradd"
+SELFSERVICE_INSTALL_USERADD = /usr/sbin/useradd
+#SELFSERVICE_INSTALL_USERADD = "/usr/sbin/pw useradd"
 
 RT_ENABLED = 0
 #RT_ENABLED = 1
@@ -178,7 +178,7 @@ 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 ./id_dsa.pub ~freeside/.ssh/authorized_keys" ;\
 	done
 
 install: install-perl-modules install-docs install-init install-rt