Bob Mottram 8 年之前
父節點
當前提交
641a576e24

+ 1
- 1
src/freedombone-app-dokuwiki 查看文件

332
 
332
 
333
     fi
333
     fi
334
 
334
 
335
-    apt-get -yq remove --purge apache-bin*
335
+    apt-get -yq remove --purge apache2-bin*
336
     if [ -d /etc/apache2 ]; then
336
     if [ -d /etc/apache2 ]; then
337
         rm -rf /etc/apache2
337
         rm -rf /etc/apache2
338
         echo $'Removed Apache installation after Dokuwiki install'
338
         echo $'Removed Apache installation after Dokuwiki install'

+ 1
- 1
src/freedombone-app-searx 查看文件

822
     apt-get -yq install git build-essential libxslt-dev python-dev python-virtualenv zlib1g-dev uwsgi uwsgi-plugin-python imagemagick
822
     apt-get -yq install git build-essential libxslt-dev python-dev python-virtualenv zlib1g-dev uwsgi uwsgi-plugin-python imagemagick
823
     apt-get -yq install apache2-utils
823
     apt-get -yq install apache2-utils
824
 
824
 
825
-    apt-get -yq remove --purge apache-bin*
825
+    apt-get -yq remove --purge apache2-bin*
826
     if [ -d /etc/apache2 ]; then
826
     if [ -d /etc/apache2 ]; then
827
         rm -rf /etc/apache2
827
         rm -rf /etc/apache2
828
         echo $'Removed Apache installation'
828
         echo $'Removed Apache installation'

+ 1
- 1
src/freedombone-image-customise 查看文件

1041
         return
1041
         return
1042
     fi
1042
     fi
1043
     chroot "$rootdir" apt-get -yq install apt-transport-https
1043
     chroot "$rootdir" apt-get -yq install apt-transport-https
1044
-    chroot "$rootdir" apt-get -yq remove --purge apache-bin*
1044
+    chroot "$rootdir" apt-get -yq remove --purge apache2-bin*
1045
     chroot "$rootdir" apt-get -yq dist-upgrade
1045
     chroot "$rootdir" apt-get -yq dist-upgrade
1046
     chroot "$rootdir" apt-get -yq install ca-certificates
1046
     chroot "$rootdir" apt-get -yq install ca-certificates
1047
     chroot "$rootdir" apt-get -yq install apt-utils
1047
     chroot "$rootdir" apt-get -yq install apt-utils

+ 1
- 1
src/freedombone-utils-database 查看文件

161
     debconf-set-selections <<< "mariadb-server mariadb-server/root_password password $MARIADB_PASSWORD"
161
     debconf-set-selections <<< "mariadb-server mariadb-server/root_password password $MARIADB_PASSWORD"
162
     debconf-set-selections <<< "mariadb-server mariadb-server/root_password_again password $MARIADB_PASSWORD"
162
     debconf-set-selections <<< "mariadb-server mariadb-server/root_password_again password $MARIADB_PASSWORD"
163
     apt-get -yq install mariadb-server mariadb-client
163
     apt-get -yq install mariadb-server mariadb-client
164
-    apt-get -yq remove --purge apache-bin*
164
+    apt-get -yq remove --purge apache2-bin*
165
     if [ -d /etc/apache2 ]; then
165
     if [ -d /etc/apache2 ]; then
166
         rm -rf /etc/apache2
166
         rm -rf /etc/apache2
167
         echo $'Removed Apache installation after MariaDB install'
167
         echo $'Removed Apache installation after MariaDB install'

+ 1
- 1
src/freedombone-utils-setup 查看文件

209
         return
209
         return
210
     fi
210
     fi
211
 
211
 
212
-    apt-get -yq remove --purge apache-bin*
212
+    apt-get -yq remove --purge apache2-bin*
213
     apt-get -yq dist-upgrade
213
     apt-get -yq dist-upgrade
214
     apt-get -yq install ca-certificates
214
     apt-get -yq install ca-certificates
215
     apt-get -yq install apt-utils
215
     apt-get -yq install apt-utils