X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=debian%2Frules;h=b501904245fb974d8487832655ba2d014e461623;hb=f34ac99a5e160d2eac4fb2cfecce820d1cf9b7ed;hp=5a65d30dbc1bae7de379cd46a7a806a8384497c6;hpb=c32c04a190f84ecef4347c5ddeec7c59ea18bc1a;p=freeside.git

diff --git a/debian/rules b/debian/rules
index 5a65d30db..b50190424 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)
@@ -129,6 +129,7 @@ install-stamp: build-stamp
 
 	install -d $(FREESIDE_DOCUMENT_ROOT)
 	install -d $(TMP)-webui/usr/local/etc/freeside/
+	install -d $(TMP)-webui/etc/insserv/overrides/
 	install -d $(TMP)/usr/local/etc/freeside/
 	install -d $(FREESIDE_CACHE)/masondata #MASONDATA
 #	install -d $(TMP)-lib/usr/bin
@@ -172,6 +173,7 @@ install-stamp: build-stamp
 	# Create Apache configurations
 	install -d $(APACHE_CONF)
 	$(MAKE) -e DESTDIR=$(APACHE_CONF) install-apache
+	install -o root -m 755 init.d/insserv-override-apache2 $(TMP)-webui/etc/insserv/overrides/apache2
 
         #Hack the build dir out of apache config
 
@@ -205,18 +207,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 +294,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