Procházet zdrojové kódy

Only purge the main apache package

Bob Mottram před 7 roky
rodič
revize
c17a68139b

+ 1
- 1
src/freedombone-app-dokuwiki Zobrazit soubor

332
 
332
 
333
     fi
333
     fi
334
 
334
 
335
-    apt-get -yq remove --purge apache*
335
+    apt-get -yq remove --purge apache-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'

+ 9
- 2
src/freedombone-app-searx Zobrazit soubor

813
         exit 62429
813
         exit 62429
814
     fi
814
     fi
815
 
815
 
816
-    apt-get -yq install python-pip libyaml-dev python-werkzeug python-babel python-lxml apache2-utils
817
-    apt-get -yq install git build-essential libxslt-dev python-dev python-virtualenv zlib1g-dev uwsgi uwsgi-plugin-python libapache2-mod-uwsgi imagemagick
816
+    apt-get -yq install python-pip libyaml-dev python-werkzeug python-babel python-lxml
817
+    apt-get -yq install git build-essential libxslt-dev python-dev python-virtualenv zlib1g-dev uwsgi uwsgi-plugin-python imagemagick
818
+    apt-get -yq install apache2-utils
819
+
820
+    apt-get -yq remove --purge apache-bin*
821
+    if [ -d /etc/apache2 ]; then
822
+        rm -rf /etc/apache2
823
+        echo $'Removed Apache installation'
824
+    fi
818
 
825
 
819
     pip install --upgrade pip
826
     pip install --upgrade pip
820
 
827
 

+ 1
- 1
src/freedombone-image-customise Zobrazit soubor

1031
         return
1031
         return
1032
     fi
1032
     fi
1033
     chroot "$rootdir" apt-get -yq install apt-transport-https
1033
     chroot "$rootdir" apt-get -yq install apt-transport-https
1034
-    chroot "$rootdir" apt-get -yq remove --purge apache*
1034
+    chroot "$rootdir" apt-get -yq remove --purge apache-bin*
1035
     chroot "$rootdir" apt-get -yq dist-upgrade
1035
     chroot "$rootdir" apt-get -yq dist-upgrade
1036
     chroot "$rootdir" apt-get -yq install ca-certificates
1036
     chroot "$rootdir" apt-get -yq install ca-certificates
1037
     chroot "$rootdir" apt-get -yq install apt-utils
1037
     chroot "$rootdir" apt-get -yq install apt-utils

+ 1
- 1
src/freedombone-utils-database Zobrazit soubor

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*
164
+    apt-get -yq remove --purge apache-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 Zobrazit soubor

209
         return
209
         return
210
     fi
210
     fi
211
 
211
 
212
-    apt-get -yq remove --purge apache*
212
+    apt-get -yq remove --purge apache-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