From de9a529d5e8a4d2981299974e9307b213dd2ec57 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 6 Aug 2018 16:15:27 +0100
Subject: [PATCH] apache check
---
src/freedombone-image-customise | 2 +-
src/freedombone-utils-web | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index 034bde93a..8a8b87a00 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -1002,7 +1002,7 @@ initialise_mesh() {
#install_tahoelafs
#install_librevault
install_patchwork
- install_web_server
+ image_install_web_server
mesh_install_scuttlebot
#install_ferment
diff --git a/src/freedombone-utils-web b/src/freedombone-utils-web
index 43a1f0285..1513ea340 100755
--- a/src/freedombone-utils-web
+++ b/src/freedombone-utils-web
@@ -652,8 +652,9 @@ function install_command_line_browser {
mark_completed "${FUNCNAME[0]}"
}
-function mesh_web_server {
- if [ -d /etc/apache2 ]; then
+function image_install_web_server {
+ # shellcheck disable=SC2154
+ if [ -d "$rootdir/etc/apache2" ]; then
# shellcheck disable=SC2154,SC2086
chroot "$rootdir" $REMOVE_PACKAGES_PURGE apache2
chroot "$rootdir" rm -rf /etc/apache2
@@ -670,7 +671,7 @@ function mesh_web_server {
function install_web_server {
if [ "$INSTALLING_MESH" ]; then
- mesh_web_server
+ image_install_web_server
return
fi
--
GitLab