From 8fc2585a102878dc626db5765d80fd6b4d99debb Mon Sep 17 00:00:00 2001
From: Teddysun <i@teddysun.com>
Date: Sun, 10 Dec 2017 11:36:33 +0900
Subject: [PATCH] Add Apache additional modules mod_swgi, mod_jk

Signed-off-by: Teddysun <i@teddysun.com>
---
 include/config.sh | 11 +++++++++++
 include/public.sh | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/include/config.sh b/include/config.sh
index 12dbf24..3bf945d 100644
--- a/include/config.sh
+++ b/include/config.sh
@@ -86,6 +86,11 @@ opcache_filename="zendopcache-7.0.5"
 apr_filename="apr-1.6.3"
 #apr-util
 apr_util_filename="apr-util-1.6.1"
+#mod_wsgi
+mod_wsgi_filename="mod_wsgi-4.5.22"
+#mod_jk
+mod_jk_filename="tomcat-connectors-1.2.42-src"
+set_hint ${mod_jk_filename} "mod_jk-1.2.42"
 #mhash
 mhash_filename="mhash-0.9.9.9"
 #libmcrypt
@@ -161,6 +166,12 @@ ${apache2_4_filename}
 do_not_install
 )
 
+apache_modules_arr=(
+${mod_wsgi_filename}
+${mod_jk_filename}
+do_not_install
+)
+
 mysql_arr=(
 ${mysql5_5_filename}
 ${mysql5_6_filename}
diff --git a/include/public.sh b/include/public.sh
index cce9587..f71cacf 100644
--- a/include/public.sh
+++ b/include/public.sh
@@ -891,6 +891,14 @@ last_confirm(){
     echo "Apache: ${apache}"
     [ "${apache}" != "do_not_install" ] && echo "Apache Location: ${apache_location}"
     echo
+    if [ "${apache_modules_install}" != "do_not_install" ]; then
+        echo "Apache Additional Modules:"
+        for a in ${apache_modules_install[@]}
+        do
+            echo "${a}"
+        done
+    fi
+    echo
     if echo "${mysql}" | grep -qi "mysql"; then
         echo "MySQL: ${mysql}"
         echo "MySQL Location: ${mysql_location}"
@@ -964,6 +972,8 @@ finally(){
         echo "Apache Location: ${apache_location}"
     fi
     echo
+    echo "Apache Modules: ${apache_modules_install}"
+    echo
     if [ -d ${mysql_location} ]; then
         echo "MySQL Server: ${mysql}"
         echo "MySQL Location: ${mysql_location}"
@@ -1073,6 +1083,7 @@ install_lamp(){
     remove_packages
 
     [ "${apache}" != "do_not_install" ] && check_installed "install_apache" "${apache_location}"
+    [ "${apache_modules_install}" != "do_not_install" ] && install_apache_modules
     if echo "${mysql}" | grep -qi "mysql"; then
         check_installed "install_mysqld" "${mysql_location}"
     elif echo "${mysql}" | grep -qi "mariadb"; then