From 0a969a8c6a0c075be3527edd1a09b9971f5a38d8 Mon Sep 17 00:00:00 2001
From: Wolfram Schneider <wosch@indexdata.dk>
Date: Fri, 8 Aug 2014 14:34:00 +0000
Subject: [PATCH] support apache 2.4 for debian and ubuntu

---
 test/bin/apache-template-update                    |   26 +++++++++++---------
 .../apache2/jasmine-dev.apache-modules.ubuntu.conf |   19 --------------
 2 files changed, 14 insertions(+), 31 deletions(-)
 delete mode 100644 tools/apache2/jasmine-dev.apache-modules.ubuntu.conf

diff --git a/test/bin/apache-template-update b/test/bin/apache-template-update
index 54d2f8c..25cfdaf 100755
--- a/test/bin/apache-template-update
+++ b/test/bin/apache-template-update
@@ -16,37 +16,39 @@ export APACHE_LOCK_FILE=$APACHE_LOG_DIR/accept.lock
 
 export MKWS_ROOT=$(pwd)/..
 
-MKWS_OS=debian 
+MKWS_OS=debian
 APACHE_VERSION=2.2
+apache2=$(env PATH=/usr/bin:/usr/sbin which apache2 httpd false 2>/dev/null | head -1)
+
 case $(uname) in
-  Darwin ) MKWS_OS=macos 
+  Darwin ) MKWS_OS=macos
 	   test -e libexec || ln -fs /usr/libexec .
 	   ;;
-  Linux )  MKWS_OS=debian 
+  Linux )  MKWS_OS=debian
 	   if [ -e /etc/debian_version ]; then
 		MKWS_OS=debian
-		# Ubuntu with Apache 2.2 can continue using debian
-		if /usr/bin/dpkg -s apache2 | grep -q "Version: 2\.4\..*ubuntu"; then
-			MKWS_OS=ubuntu
-                        APACHE_VERSION=2.4
+                if $apache2 -v | egrep -q 'Server version: Apache/2\.4\.'; then
+                    APACHE_VERSION=2.4
 	   	fi
 	   fi
 	   if [ -e /etc/redhat-release ]; then
-		MKWS_OS=centos 	
+		MKWS_OS=centos
 	   fi
 	   ;;
   * ) MKWS_OS=debian ;;
 esac
 
-export APACHE_MODULES="$MKWS_ROOT/tools/apache2/jasmine-dev.apache-modules.$MKWS_OS.conf"
 
 if [ "$APACHE_VERSION" = "2.4" ]; then
-	: ${MKWS_APACHE_TEMPLATE="$MKWS_ROOT/tools/apache2/jasmine-dev.template-2.4"}
+    : ${MKWS_APACHE_TEMPLATE="$MKWS_ROOT/tools/apache2/jasmine-dev.template-$APACHE_VERSION"}
+    APACHE_MODULES="$MKWS_ROOT/tools/apache2/jasmine-dev.apache-modules-$APACHE_VERSION.$MKWS_OS.conf"
 else
-	: ${MKWS_APACHE_TEMPLATE="$MKWS_ROOT/tools/apache2/jasmine-dev.template"}
+    : ${MKWS_APACHE_TEMPLATE="$MKWS_ROOT/tools/apache2/jasmine-dev.template"}
+    APACHE_MODULES="$MKWS_ROOT/tools/apache2/jasmine-dev.apache-modules.$MKWS_OS.conf"
 fi
-: ${MKWS_APACHE_FILE="$APACHE_LOG_DIR/jasmine-dev"}
 
+: ${MKWS_APACHE_FILE="$APACHE_LOG_DIR/jasmine-dev"}
+export APACHE_MODULES
 
 perl -npe 's,\${(.*?)},$ENV{$1},g; ' $MKWS_APACHE_TEMPLATE > $MKWS_APACHE_FILE.tmp
 mv -f $MKWS_APACHE_FILE.tmp $MKWS_APACHE_FILE
diff --git a/tools/apache2/jasmine-dev.apache-modules.ubuntu.conf b/tools/apache2/jasmine-dev.apache-modules.ubuntu.conf
deleted file mode 100644
index 612d1c1..0000000
--- a/tools/apache2/jasmine-dev.apache-modules.ubuntu.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-Include /etc/apache2/mods-available/alias.load
-Include /etc/apache2/mods-available/authz*.load
-Include /etc/apache2/mods-available/proxy*.load
-Include /etc/apache2/mods-available/rewrite.load
-Include /etc/apache2/mods-available/headers.load
-Include /etc/apache2/mods-available/mime.load
-Include /etc/apache2/mods-available/deflate.load
-
-Include /etc/apache2/mods-available/alias*.conf
-Include /etc/apache2/mods-available/proxy*.conf
-Include /etc/apache2/mods-available/mime.conf
-Include /etc/apache2/mods-available/deflate.conf
-
-Include /etc/apache2/mods-enabled/mpm*conf
-Include /etc/apache2/mods-enabled/mpm*load
-Include /etc/apache2/mods-available/xml2enc.load
-Include /etc/apache2/mods-available/filter.load
-Include /etc/apache2/mods-available/slotmem_shm.load
-
-- 
1.7.10.4