Apache2

src/freedombone-app-dokuwiki

@@ -332,7 +332,7 @@ function install_dokuwiki {
 
     fi
 
-    apt-get -yq remove --purge apache-bin*
+    apt-get -yq remove --purge apache2-bin*
     if [ -d /etc/apache2 ]; then
         rm -rf /etc/apache2
         echo $'Removed Apache installation after Dokuwiki install'

src/freedombone-app-searx

@@ -822,7 +822,7 @@ function install_searx {
     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*
+    apt-get -yq remove --purge apache2-bin*
     if [ -d /etc/apache2 ]; then
         rm -rf /etc/apache2
         echo $'Removed Apache installation'

src/freedombone-image-customise

@@ -1041,7 +1041,7 @@ function image_setup_utils {
         return
     fi
     chroot "$rootdir" apt-get -yq install apt-transport-https
-    chroot "$rootdir" apt-get -yq remove --purge apache-bin*
+    chroot "$rootdir" apt-get -yq remove --purge apache2-bin*
     chroot "$rootdir" apt-get -yq dist-upgrade
     chroot "$rootdir" apt-get -yq install ca-certificates
     chroot "$rootdir" apt-get -yq install apt-utils

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-bin*
+    apt-get -yq remove --purge apache2-bin*
     if [ -d /etc/apache2 ]; then
         rm -rf /etc/apache2
         echo $'Removed Apache installation after MariaDB install'

src/freedombone-utils-setup

@@ -209,7 +209,7 @@ function initial_setup {
         return
     fi
 
-    apt-get -yq remove --purge apache-bin*
+    apt-get -yq remove --purge apache2-bin*
     apt-get -yq dist-upgrade
     apt-get -yq install ca-certificates
     apt-get -yq install apt-utils