diff --git a/src/freedombone b/src/freedombone index a66cb244..77445370 100755 --- a/src/freedombone +++ b/src/freedombone @@ -5928,6 +5928,11 @@ 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 -y install mariadb-server + apt-get -y remove --purge apache* + if [ -d /etc/apache2 ]; then + rm -rf /etc/apache2 + echo 'Removed Apache installation after MariaDB install' + fi if [ ! -d /etc/mysql ]; then echo "ERROR: mariadb-server does not appear to have installed. $CHECK_MESSAGE" @@ -6148,7 +6153,7 @@ function install_owncloud { apt-get -y remove --purge apache* if [ -d /etc/apache2 ]; then rm -rf /etc/apache2 - echo 'Removed Apache installation' + echo 'Removed Apache installation after Owncloud install' fi install_mariadb get_mariadb_password @@ -6577,7 +6582,7 @@ function install_wiki { apt-get -y remove --purge apache* if [ -d /etc/apache2 ]; then rm -rf /etc/apache2 - echo 'Removed Apache installation' + echo 'Removed Apache installation after Dokuwiki install' fi if [ ! -d /var/www/$WIKI_DOMAIN_NAME ]; then