[freeside-commits] branch FREESIDE_2_3_BRANCH updated. 583b3d28d3b999aba3c68c3bcdd3aeaaae9e0f9c

[Ivan]

The branch, FREESIDE_2_3_BRANCH has been updated
       via  583b3d28d3b999aba3c68c3bcdd3aeaaae9e0f9c (commit)
      from  3548286294cdb84cdc50a4877dabb97ec38223ca (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 583b3d28d3b999aba3c68c3bcdd3aeaaae9e0f9c
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Aug 22 18:29:45 2012 -0700

    fix apache starting before postgres or mysql, RT#18983

diff --git a/Makefile b/Makefile
index 903c0eb..f61d0bc 100644
--- a/Makefile
+++ b/Makefile
@@ -67,6 +67,7 @@ HTTPD_RESTART = /etc/init.d/apache2 restart
 #(an include directory, not a file, "Include /etc/apache/conf.d" in httpd.conf)
 #deb (3.1+), apache2
 APACHE_CONF = /etc/apache2/conf.d
+INSSERV_OVERRIDE = /etc/insserv/overrides
 
 FREESIDE_RESTART = ${INIT_FILE} restart
 
@@ -270,6 +271,7 @@ install-apache:
 	      s'%%%MASON_HANDLER%%%'${MASON_HANDLER}'g; \
 	    " ${APACHE_CONF}/freeside-*.conf \
 	  ) || true
+	[ -d ${INSSERV_OVERRIDE} ] && [ -x /sbin/insserv ] && ( install -o root -m 755 init.d/insserv-override-apache2 ${INSSERV_OVERRIDE}/apache2 && insserv -d ) || true
 
 install-selfservice:
 	[ -e ~freeside ] || cp -pr /etc/skel ~freeside && chown -R freeside ~freeside
diff --git a/init.d/insserv-override-apache2 b/init.d/insserv-override-apache2
new file mode 100644
index 0000000..1b333e8
--- /dev/null
+++ b/init.d/insserv-override-apache2
@@ -0,0 +1,11 @@
+### BEGIN INIT INFO
+# Provides:          apache2
+# Required-Start:    $local_fs $remote_fs $network $syslog $named
+# Required-Stop:     $local_fs $remote_fs $network $syslog $named
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# X-Interactive:     true
+# Short-Description: Start/stop apache2 web server
+# Should-Start:      postgresql mysql
+# Should-Stop:       postgresql mysql
+### END INIT INFO

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

Summary of changes:
 Makefile                        |    2 ++
 init.d/insserv-override-apache2 |   11 +++++++++++
 2 files changed, 13 insertions(+), 0 deletions(-)
 create mode 100644 init.d/insserv-override-apache2