From c32c04a190f84ecef4347c5ddeec7c59ea18bc1a Mon Sep 17 00:00:00 2001
From: Jeremy Davis <jeremyd@freeside.biz>
Date: Thu, 18 Dec 2014 10:36:24 -0500
Subject: Ticket 32039 Debian self-service packages

---
 debian/rules | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

(limited to 'debian/rules')

diff --git a/debian/rules b/debian/rules
index e640398e4..5a65d30db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,7 @@ export FREESIDE_LOG = $(TMP)/usr/local/etc/freeside
 export FREESIDE_LOCK = $(TMP)/usr/local/etc/freeside
 export FREESIDE_CACHE = $(TMP)/usr/local/etc/freeside
 export FREESIDE_EXPORT = $(TMP)/usr/local/etc/freeside
-export FREESIDE_SS = $(TMP)/usr/share/docs/freeside
+
 export DIST_CONF = ${FREESIDE_CONF}/default_conf
 
 #XXX own subdir?
@@ -94,7 +94,10 @@ build-stamp:
 	# Add commands to compile the package here
 	
 	( cd FS/ && $(PERL) Makefile.PL INSTALLDIRS=vendor && $(MAKE) )
-	$(MAKE) perl-modules	
+	$(MAKE) perl-modules
+	
+	( cd fs_selfservice/FS-SelfService/ && $(PERL) Makefile.PL INSTALLDIRS=vendor && $(MAKE) )
+	
 	#install this for freeside-setup
 	install -d $(DIST_CONF)
 	install `ls -d conf/[a-z]* | grep -v CVS | grep -v '^conf/registries'` $(DIST_CONF)
@@ -202,6 +205,22 @@ install-stamp: build-stamp
         " ${TMP}-lib/usr/bin/* \
 	  ${TMP}-webui/usr/local/etc/freeside/handler.pl
 
+	#Self-service
+	
+	( cd fs_selfservice/FS-SelfService/; $(MAKE) -e DESTDIR=${TMP}-selfservice-lib install ) 
+	install -d -o freeside ${TMP}-selfservice-lib/usr/local/freeside
+	touch ${TMP}-selfservice-lib/usr/local/freeside/selfservice_socket 
+	chown -R freeside ${TMP}-selfservice-lib/usr/local/freeside
+	chmod 600 ${TMP}-selfservice-lib/usr/local/freeside/selfservice_socket
+	
+	install -d ${TMP}-selfservice-ui/var/www/
+	cp -R fs_selfservice/FS-SelfService/cgi ${TMP}-selfservice-ui/var/www/selfservice-DIST
+
+	#NG-selfservice
+
+	install -d ${TMP}-ng-selfservice/var/www/
+	cp -R ng_selfservice ${TMP}-ng-selfservice/var/www/ng_selfservice-DIST/
+
 	#RT Config
 
 	( cd rt; \
-- 
cgit v1.2.1


From 59c6f5d84d8f00597a25b111deb51707f844954e Mon Sep 17 00:00:00 2001
From: Jeremy Davis <jeremyd@freeside.biz>
Date: Thu, 18 Dec 2014 11:52:44 -0500
Subject: Ticket #32039 Debian self-service packages

---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'debian/rules')

diff --git a/debian/rules b/debian/rules
index 5a65d30db..f359e37b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -96,7 +96,7 @@ build-stamp:
 	( cd FS/ && $(PERL) Makefile.PL INSTALLDIRS=vendor && $(MAKE) )
 	$(MAKE) perl-modules
 	
-	( cd fs_selfservice/FS-SelfService/ && $(PERL) Makefile.PL INSTALLDIRS=vendor && $(MAKE) )
+	( cd fs_selfservice/FS-SelfService/ && $(PERL) Makefile.PL && $(MAKE) )
 	
 	#install this for freeside-setup
 	install -d $(DIST_CONF)
-- 
cgit v1.2.1


From 9e77fe17c8a593f45ffd7df5b2611ae908c4345d Mon Sep 17 00:00:00 2001
From: Jeremy Davis <jeremyd@freeside.biz>
Date: Thu, 18 Dec 2014 15:31:21 -0500
Subject: Ticket #32039 Debian self-service packages

---
 debian/rules | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'debian/rules')

diff --git a/debian/rules b/debian/rules
index f359e37b2..3754f8379 100755
--- a/debian/rules
+++ b/debian/rules
@@ -205,18 +205,20 @@ install-stamp: build-stamp
         " ${TMP}-lib/usr/bin/* \
 	  ${TMP}-webui/usr/local/etc/freeside/handler.pl
 
-	#Self-service
+	# Self-service
 	
 	( cd fs_selfservice/FS-SelfService/; $(MAKE) -e DESTDIR=${TMP}-selfservice-lib install ) 
-	install -d -o freeside ${TMP}-selfservice-lib/usr/local/freeside
+	install -d -o freeside -g freeside ${TMP}-selfservice-lib/usr/local/freeside
 	touch ${TMP}-selfservice-lib/usr/local/freeside/selfservice_socket 
 	chown -R freeside ${TMP}-selfservice-lib/usr/local/freeside
 	chmod 600 ${TMP}-selfservice-lib/usr/local/freeside/selfservice_socket
 	
-	install -d ${TMP}-selfservice-ui/var/www/
+	install -d -o freeside -g freeside ${TMP}-selfservice-ui/var/www/
 	cp -R fs_selfservice/FS-SelfService/cgi ${TMP}-selfservice-ui/var/www/selfservice-DIST
+	chown freeside.freeside ${TMP}-selfservice-ui/var/www/selfservice-DIST/*.cgi ${TMP}-selfservice-ui/var/www/selfservice-DIST/*/*.cgi;
+	chmod 755 ${TMP}-selfservice-ui/var/www/selfservice-DIST/*.cgi ${TMP}-selfservice-ui/var/www/selfservice-DIST/*/*.cgi
 
-	#NG-selfservice
+	# NG-selfservice
 
 	install -d ${TMP}-ng-selfservice/var/www/
 	cp -R ng_selfservice ${TMP}-ng-selfservice/var/www/ng_selfservice-DIST/
@@ -290,7 +292,7 @@ binary-indep: build install
 	dh_perl
 	dh_link
 	dh_compress 
-	dh_fixperms
+	dh_fixperms -X/var/www/selfservice-DIST -X/usr/local/freeside
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
-- 
cgit v1.2.1