[freeside-commits] freeside/install/rpm freeside.spec, 1.1.4.25, 1.1.4.26

[Richard Siddall]

Update of /home/cvs/cvsroot/freeside/install/rpm
In directory wavetail.420.am:/tmp/cvs-serv6007/install/rpm

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	freeside.spec 
Log Message:
More changes to the self-service RPMs, mostly fixing up paths so the RPM-installed
self-service files are not under /usr/local on the remote machine.
Also fixed an initialization problem where the system configuration files for
Freeside were assumed to be under /etc/default, not /etc/sysconfig


Index: freeside.spec
===================================================================
RCS file: /home/cvs/cvsroot/freeside/install/rpm/Attic/freeside.spec,v
retrieving revision 1.1.4.25
retrieving revision 1.1.4.26
diff -u -d -r1.1.4.25 -r1.1.4.26
--- freeside.spec	24 Aug 2008 03:40:05 -0000	1.1.4.25
+++ freeside.spec	26 Aug 2008 13:59:10 -0000	1.1.4.26
@@ -1,6 +1,6 @@
 %{!?_initrddir:%define _initrddir /etc/rc.d/init.d}
 %{!?version:%define version 1.7.3}
-%{!?release:%define release 2}
+%{!?release:%define release 3}
 
 Summary: Freeside ISP Billing System
 Name: freeside
@@ -25,6 +25,7 @@
 %define freeside_export		/etc/freeside
 %define freeside_lock		/var/lock/freeside
 %define freeside_log		/var/log/freeside
+%define freeside_socket         /etc/freeside
 %define	rt_enabled		0
 %define apache_conffile		/etc/httpd/conf/httpd.conf
 %define	apache_confdir		/etc/httpd/conf.d
@@ -129,6 +130,14 @@
 perl -pi -e 's|\s+-o\s+freeside\s+| |g' Makefile
 perl -ni -e 'print if !/\s+chown\s+/;' Makefile
 
+# Fix-ups for self-service.  Should merge this into Makefile
+perl -pi -e 's|/usr/local/sbin|%{_sbindir}|g' FS/bin/freeside-selfservice-server
+perl -pi -e 's|/usr/local/bin|%{_bindir}|g' fs_selfservice/FS-SelfService/Makefile.PL
+perl -pi -e 's|/usr/local/freeside|%{freeside_socket}|g' fs_selfservice/FS-SelfService/*.pm
+perl -pi -e 's|socket\s*=\s*"/usr/local/freeside|socket = "%{freeside_socket}|g' fs_selfservice/FS-SelfService/freeside-selfservice-*
+perl -pi -e 's|log_file\s*=\s*"/usr/local/freeside|log_file = "%{freeside_log}|g' fs_selfservice/FS-SelfService/freeside-selfservice-*
+perl -pi -e 's|lock_file\s*=\s*"/usr/local/freeside|lock_file = "%{freeside_lock}|g' fs_selfservice/FS-SelfService/freeside-selfservice-*
+
 # Override find-requires/find-provides to supplement Perl requires for HTML::Mason file handler.pl
 cat << \EOF > %{name}-req
 #!/bin/sh
@@ -197,6 +206,7 @@
 	  s/%%%%%%QUEUED_USER%%%%%%/%{fs_queue_user}/g;\
 	  s/%%%%%%SELFSERVICE_USER%%%%%%/%{fs_selfservice_user}/g;\
 	  s/%%%%%%SELFSERVICE_MACHINES%%%%%%//g;\
+	  s|/etc/default|/etc/sysconfig|g;\
 	" $RPM_BUILD_ROOT%{_initrddir}/%{name}
 
 # Install the HTTPD configuration snippet for HTML::Mason
@@ -362,6 +372,9 @@
 
 %files selfservice-core -f fs_selfservice/FS-SelfService/%{name}-%{version}-%{release}-selfservice-core-filelist
 %defattr(-, freeside, freeside, 0644)
+%attr(-,freeside,freeside) %dir %{freeside_socket}
+%attr(-,freeside,freeside) %dir %{freeside_lock}
+%attr(-,freeside,freeside) %dir %{freeside_log}
 
 %files selfservice-cgi
 %defattr(-, freeside, freeside, 0644)
@@ -373,6 +386,9 @@
 %attr(0755,freeside,freeside) %{freeside_document_root}/selfservice/php
 
 %changelog
+* Mon Aug 25 2008 Richard Siddall <richard.siddall at elirion.net> - 1.7.3-3
+- More revisions for self-service interface
+
 * Sat Aug 23 2008 Richard Siddall <richard.siddall at elirion.net> - 1.7.3-2
 - Revisions for self-service interface
 - RT support is still missing