Bob Mottram 8 jaren geleden
bovenliggende
commit
641a576e24

+ 1
- 1
src/freedombone-app-dokuwiki Bestand weergeven

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

+ 1
- 1
src/freedombone-app-searx Bestand weergeven

@@ -822,7 +822,7 @@ function install_searx {
822 822
     apt-get -yq install git build-essential libxslt-dev python-dev python-virtualenv zlib1g-dev uwsgi uwsgi-plugin-python imagemagick
823 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 826
     if [ -d /etc/apache2 ]; then
827 827
         rm -rf /etc/apache2
828 828
         echo $'Removed Apache installation'

+ 1
- 1
src/freedombone-image-customise Bestand weergeven

@@ -1041,7 +1041,7 @@ function image_setup_utils {
1041 1041
         return
1042 1042
     fi
1043 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 1045
     chroot "$rootdir" apt-get -yq dist-upgrade
1046 1046
     chroot "$rootdir" apt-get -yq install ca-certificates
1047 1047
     chroot "$rootdir" apt-get -yq install apt-utils

+ 1
- 1
src/freedombone-utils-database Bestand weergeven

@@ -161,7 +161,7 @@ function install_mariadb {
161 161
     debconf-set-selections <<< "mariadb-server mariadb-server/root_password password $MARIADB_PASSWORD"
162 162
     debconf-set-selections <<< "mariadb-server mariadb-server/root_password_again password $MARIADB_PASSWORD"
163 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 165
     if [ -d /etc/apache2 ]; then
166 166
         rm -rf /etc/apache2
167 167
         echo $'Removed Apache installation after MariaDB install'

+ 1
- 1
src/freedombone-utils-setup Bestand weergeven

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