X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=3405956dfad289a70d6752e7723a134e087e6a44;hb=refs%2Fheads%2FFREESIDE_1_7_BRANCH;hp=2752ae035599a9250e80feee51c5ca5ef6faad32;hpb=ca183d69d2aa9e9d0aba3d0c232d02309490fcd8;p=freeside.git

diff --git a/Makefile b/Makefile
index 2752ae035..3405956df 100644
--- a/Makefile
+++ b/Makefile
@@ -22,11 +22,11 @@ MASON_HANDLER = ${FREESIDE_CONF}/handler.pl
 MASONDATA = ${FREESIDE_CACHE}/masondata
 
 #mod_perl v1
-APACHE_VERSION = 1
+#APACHE_VERSION = 1
 #mod_perl v2 prereleases up to and including 1.999_21
 #APACHE_VERSON = 1.99
 #mod_perl v2 proper and prereleases 1.999_22 and after
-#APACHE_VERSION = 2
+APACHE_VERSION = 2
 
 #deb
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
@@ -54,9 +54,9 @@ INIT_INSTALL = /usr/sbin/update-rc.d freeside defaults 21 20
 #INIT_INSTALL = /usr/bin/true
 
 #deb, suse
-HTTPD_RESTART = /etc/init.d/apache restart
+#HTTPD_RESTART = /etc/init.d/apache restart
 #deb w/apache2
-#HTTPD_RESTART = /etc/init.d/apache2 restart
+HTTPD_RESTART = /etc/init.d/apache2 restart
 #redhat, fedora, mandrake
 #HTTPD_RESTART = /etc/init.d/httpd restart
 #freebsd
@@ -68,9 +68,9 @@ HTTPD_RESTART = /etc/init.d/apache restart
 
 #(an include directory, not a file, "Include /etc/apache/conf.d" in httpd.conf)
 #deb (3.1+), apache1
-APACHE_CONF = /etc/apache/conf.d
+#APACHE_CONF = /etc/apache/conf.d
 #deb (3.1+), apache2
-#APACHE_CONF = /etc/apache2/conf.d
+APACHE_CONF = /etc/apache2/conf.d
 
 FREESIDE_RESTART = ${INIT_FILE} restart
 
@@ -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
 
@@ -115,10 +115,10 @@ RT_PATH = /opt/rt3
 
 #only used for dev kludge now, not a big deal
 FREESIDE_PATH = `pwd`
-PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.8.8/
+PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.10.0/
 
-VERSION=1.7.3
-TAG=freeside_1_7_3
+VERSION=1.7.4
+TAG=freeside_1_7_4
 
 DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1
 
@@ -164,6 +164,7 @@ install-docs: docs
 	cp htetc/handler.pl ${MASON_HANDLER}
 	  perl -p -i -e "\
 	    s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
+	    s'%%%FREESIDE_CONF%%%'${FREESIDE_CONF}'g; \
 	    s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \
 	    s'%%%MASONDATA%%%'${MASONDATA}'g;\
 	  " ${MASON_HANDLER}
@@ -192,11 +193,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 +250,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" ;\
@@ -258,7 +264,7 @@ install-selfservice:
 update-selfservice:
 	for MACHINE in ${SELFSERVICE_MACHINES}; do \
 	  RSYNC_RSH=ssh rsync -rlptz fs_selfservice/FS-SelfService/ ${SELFSERVICE_INSTALL_USER}@$$MACHINE:FS-SelfService ;\
-	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; perl Makefile.PL && make" ;\
+	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; make clean; perl Makefile.PL && make" ;\
 	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; sudo make install" ;\
 	done
 
@@ -360,6 +366,7 @@ release:
 	# Update the RPM specfile
 	cvs edit ${RPM_SPECFILE}
 	perl -p -i -e "s/\d+[^\}]+/${VERSION}/ if /%define\s+version\s+(\d+[^\}]+)\}/;" ${RPM_SPECFILE}
+	perl -p -i -e "s/\d+[^\}]+/1/ if /%define\s+release\s+(\d+[^\}]+)\}/;" ${RPM_SPECFILE}
 	cvs commit -m "Updated for ${VERSION}" ${RPM_SPECFILE}
 
 	# Update the Debian changelog