X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=215ec14a5df6ecdae42b005c902a9d30fdc106a0;hb=34e738b5b65449b79a34dba9ff1fd742e278e6d5;hp=825c97669689cf3738b06cd703f76301c671fe51;hpb=728a98cf17b93919f309e113362476fd2c69e5c6;p=freeside.git diff --git a/Makefile b/Makefile index 825c97669..215ec14a5 100644 --- a/Makefile +++ b/Makefile @@ -37,16 +37,16 @@ INIT_FILE = /etc/init.d/freeside #deb INIT_INSTALL = /usr/sbin/update-rc.d freeside defaults 21 20 #redhat, fedora -#INIT_INSTALL = /sbin/chkconfig freeside +#INIT_INSTALL = /sbin/chkconfig freeside on #not necessary (freebsd) -#INIT_INSTALL = /bin/true +#INIT_INSTALL = /usr/bin/true #deb, suse HTTPD_RESTART = /etc/init.d/apache restart #redhat, fedora, mandrake #HTTPD_RESTART = /etc/init.d/httpd restart #freebsd -#HTTPD_RESTART = /usr/local/etc/rc.d/apache.sh stop; sleep 10; /usr/local/etc/rc.d/apache.sh start +#HTTPD_RESTART = /usr/local/etc/rc.d/apache.sh stop || true; sleep 10; /usr/local/etc/rc.d/apache.sh start #openbsd #HTTPD_RESTART = kill -TERM `cat /var/www/logs/httpd.pid`; sleep 10; /usr/sbin/httpd -u -DSSL #apache @@ -185,7 +185,7 @@ install-init: ${INIT_INSTALL} install-selfservice: - [ -e ~freeside/.ssh/id_dsa.pub ] || su -c 'ssh-keygen -t dsa' - freeside + [ -e ~freeside/.ssh/id_dsa.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" ;\