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

Try to ensure that Apache doesn't get installed

This commit is contained in:
Bob Mottram 2015-02-02 21:31:31 +00:00
parent da606c5574
commit ef40df6945
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/freedombone
View File

@ -6145,6 +6145,11 @@ function install_owncloud {
fi fi
fi fi
apt-get -y install owncloud apt-get -y install owncloud
apt-get -y remove --purge apache*
if [ -d /etc/apache2 ]; then
rm -rf /etc/apache2
echo 'Removed Apache installation'
fi
install_mariadb install_mariadb
get_mariadb_password get_mariadb_password
@ -6569,6 +6574,11 @@ function install_wiki {
return return
fi fi
apt-get -y install dokuwiki apt-get -y install dokuwiki
apt-get -y remove --purge apache*
if [ -d /etc/apache2 ]; then
rm -rf /etc/apache2
echo 'Removed Apache installation'
fi
if [ ! -d /var/www/$WIKI_DOMAIN_NAME ]; then if [ ! -d /var/www/$WIKI_DOMAIN_NAME ]; then
mkdir /var/www/$WIKI_DOMAIN_NAME mkdir /var/www/$WIKI_DOMAIN_NAME