diff --git a/src/freedombone-app-dokuwiki b/src/freedombone-app-dokuwiki index 5fb13de5..7f1a1882 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-bin* + apt-get -yq remove --purge apache2-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 d77363a1..7b4c0280 100755 --- a/src/freedombone-app-searx +++ b/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' diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise index c0d24520..5e814c1b 100755 --- a/src/freedombone-image-customise +++ b/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 diff --git a/src/freedombone-utils-database b/src/freedombone-utils-database index ad64cd4d..ee61d02a 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-bin* + apt-get -yq remove --purge apache2-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 2c20c9ef..56769800 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-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