|
@@ -5928,6 +5928,11 @@ function install_mariadb {
|
5928
|
5928
|
debconf-set-selections <<< "mariadb-server mariadb-server/root_password password $MARIADB_PASSWORD"
|
5929
|
5929
|
debconf-set-selections <<< "mariadb-server mariadb-server/root_password_again password $MARIADB_PASSWORD"
|
5930
|
5930
|
apt-get -y install mariadb-server
|
|
5931
|
+ apt-get -y remove --purge apache*
|
|
5932
|
+ if [ -d /etc/apache2 ]; then
|
|
5933
|
+ rm -rf /etc/apache2
|
|
5934
|
+ echo 'Removed Apache installation after MariaDB install'
|
|
5935
|
+ fi
|
5931
|
5936
|
|
5932
|
5937
|
if [ ! -d /etc/mysql ]; then
|
5933
|
5938
|
echo "ERROR: mariadb-server does not appear to have installed. $CHECK_MESSAGE"
|
|
@@ -6148,7 +6153,7 @@ function install_owncloud {
|
6148
|
6153
|
apt-get -y remove --purge apache*
|
6149
|
6154
|
if [ -d /etc/apache2 ]; then
|
6150
|
6155
|
rm -rf /etc/apache2
|
6151
|
|
- echo 'Removed Apache installation'
|
|
6156
|
+ echo 'Removed Apache installation after Owncloud install'
|
6152
|
6157
|
fi
|
6153
|
6158
|
install_mariadb
|
6154
|
6159
|
get_mariadb_password
|
|
@@ -6577,7 +6582,7 @@ function install_wiki {
|
6577
|
6582
|
apt-get -y remove --purge apache*
|
6578
|
6583
|
if [ -d /etc/apache2 ]; then
|
6579
|
6584
|
rm -rf /etc/apache2
|
6580
|
|
- echo 'Removed Apache installation'
|
|
6585
|
+ echo 'Removed Apache installation after Dokuwiki install'
|
6581
|
6586
|
fi
|
6582
|
6587
|
|
6583
|
6588
|
if [ ! -d /var/www/$WIKI_DOMAIN_NAME ]; then
|