[freeside-commits] branch master updated. fec65a77360f792a868e51c68c41885b59e62608

[Jeremy Davis]

The branch, master has been updated
       via  fec65a77360f792a868e51c68c41885b59e62608 (commit)
      from  f5ceeda9a413e355abf0009eed503ce1a82d1a5b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fec65a77360f792a868e51c68c41885b59e62608
Author: Jeremy Davis <jeremyd at freeside.biz>
Date:   Wed Mar 4 10:57:08 2015 -0500

    Ticket #33672 Apache starts before postgres

diff --git a/debian/postinst b/debian/postinst
index 67c0835..09f9dae 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -2,6 +2,7 @@
 
 chown -R freeside /usr/local/etc/freeside
 /usr/sbin/update-rc.d freeside defaults 23 01
+/sbin/insserv -d
 rm -fr  /usr/local/etc/freeside/masondata/*
 
 exit 0
diff --git a/debian/rules b/debian/rules
index 3754f83..b501904 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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
 

-----------------------------------------------------------------------

Summary of changes:
 debian/postinst |    1 +
 debian/rules    |    2 ++
 2 files changed, 3 insertions(+)