free
/
freedombone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove any apache install after mariadb

This commit is contained in:
Bob Mottram 2015-02-02 21:34:08 +00:00
parent ef40df6945
commit 5c6f5ee785
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/freedombone
View File

@ -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