From c17a68139becbe934eb19a3ea71e023c67da0765 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 12 Jun 2017 13:17:55 +0100
Subject: [PATCH] Only purge the main apache package

---
 src/freedombone-app-dokuwiki    |  2 +-
 src/freedombone-app-searx       | 11 +++++++++--
 src/freedombone-image-customise |  2 +-
 src/freedombone-utils-database  |  2 +-
 src/freedombone-utils-setup     |  2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/freedombone-app-dokuwiki b/src/freedombone-app-dokuwiki
index 3cc7a7b5..5fb13de5 100755
--- a/src/freedombone-app-dokuwiki
+++ b/src/freedombone-app-dokuwiki
@@ -332,7 +332,7 @@ function install_dokuwiki {
 
     fi
 
-    apt-get -yq remove --purge apache*
+    apt-get -yq remove --purge apache-bin*
     if [ -d /etc/apache2 ]; then
         rm -rf /etc/apache2
         echo $'Removed Apache installation after Dokuwiki install'
diff --git a/src/freedombone-app-searx b/src/freedombone-app-searx
index 53cb0daf..158a6b0c 100755
--- a/src/freedombone-app-searx
+++ b/src/freedombone-app-searx
@@ -813,8 +813,15 @@ function install_searx {
         exit 62429
     fi
 
-    apt-get -yq install python-pip libyaml-dev python-werkzeug python-babel python-lxml apache2-utils
-    apt-get -yq install git build-essential libxslt-dev python-dev python-virtualenv zlib1g-dev uwsgi uwsgi-plugin-python libapache2-mod-uwsgi imagemagick
+    apt-get -yq install python-pip libyaml-dev python-werkzeug python-babel python-lxml
+    apt-get -yq install git build-essential libxslt-dev python-dev python-virtualenv zlib1g-dev uwsgi uwsgi-plugin-python imagemagick
+    apt-get -yq install apache2-utils
+
+    apt-get -yq remove --purge apache-bin*
+    if [ -d /etc/apache2 ]; then
+        rm -rf /etc/apache2
+        echo $'Removed Apache installation'
+    fi
 
     pip install --upgrade pip
 
diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index 8a3e801f..87118580 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -1031,7 +1031,7 @@ function image_setup_utils {
         return
     fi
     chroot "$rootdir" apt-get -yq install apt-transport-https
-    chroot "$rootdir" apt-get -yq remove --purge apache*
+    chroot "$rootdir" apt-get -yq remove --purge apache-bin*
     chroot "$rootdir" apt-get -yq dist-upgrade
     chroot "$rootdir" apt-get -yq install ca-certificates
     chroot "$rootdir" apt-get -yq install apt-utils
diff --git a/src/freedombone-utils-database b/src/freedombone-utils-database
index dc23ed99..ad64cd4d 100755
--- a/src/freedombone-utils-database
+++ b/src/freedombone-utils-database
@@ -161,7 +161,7 @@ function install_mariadb {
     debconf-set-selections <<< "mariadb-server mariadb-server/root_password password $MARIADB_PASSWORD"
     debconf-set-selections <<< "mariadb-server mariadb-server/root_password_again password $MARIADB_PASSWORD"
     apt-get -yq install mariadb-server mariadb-client
-    apt-get -yq remove --purge apache*
+    apt-get -yq remove --purge apache-bin*
     if [ -d /etc/apache2 ]; then
         rm -rf /etc/apache2
         echo $'Removed Apache installation after MariaDB install'
diff --git a/src/freedombone-utils-setup b/src/freedombone-utils-setup
index e4677a24..2dacd409 100755
--- a/src/freedombone-utils-setup
+++ b/src/freedombone-utils-setup
@@ -209,7 +209,7 @@ function initial_setup {
         return
     fi
 
-    apt-get -yq remove --purge apache*
+    apt-get -yq remove --purge apache-bin*
     apt-get -yq dist-upgrade
     apt-get -yq install ca-certificates
     apt-get -yq install apt-utils