瀏覽代碼

Remove any apache install after mariadb

Bob Mottram 10 年之前
父節點
當前提交
5c6f5ee785
共有 1 個文件被更改,包括 7 次插入2 次删除
  1. 7
    2
      src/freedombone

+ 7
- 2
src/freedombone 查看文件

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