[freeside-commits] branch master updated. 5691616696e80f44b4ed29605a71a806801e5075

[Ivan]

The branch, master has been updated
       via  5691616696e80f44b4ed29605a71a806801e5075 (commit)
       via  b363aa7cba74133e183fe0e3f64808396e3c854b (commit)
      from  03b8791b0253e3fd66a6eae75ff54bdd7b51db9d (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 5691616696e80f44b4ed29605a71a806801e5075
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Aug 22 18:29:34 2012 -0700

    fix apache starting before postgres or mysql, RT#18983

diff --git a/Makefile b/Makefile
index 4c0f712..208398a 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
 
@@ -272,6 +273,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

commit b363aa7cba74133e183fe0e3f64808396e3c854b
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Aug 22 18:21:58 2012 -0700

    fix dev-docs target

diff --git a/Makefile b/Makefile
index 903c0eb..4c0f712 100644
--- a/Makefile
+++ b/Makefile
@@ -185,6 +185,8 @@ dev-docs:
 	perl -p -i -e "\
 	  s'###use Module::Refresh;###'use Module::Refresh;'; \
 	  s'###Module::Refresh->refresh;###'Module::Refresh->refresh;'; \
+	  s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
+	  s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \
 	" ${MASON_HANDLER} || true
 
 perl-modules:

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

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