travis-ci: we dont need Apache installed

[nominatim.git] / vagrant / Install-on-Ubuntu-20.sh

diff --git a/vagrant/Install-on-Ubuntu-20.sh b/vagrant/Install-on-Ubuntu-20.sh
index 85a95c9b4a268e9c4442d212eb06e7183ad244f6..a7029be2e88a8c11167c7590d60e7a5cf5bbe29b 100644 (file)
--- a/vagrant/Install-on-Ubuntu-20.sh
+++ b/vagrant/Install-on-Ubuntu-20.sh
@@ -6,7 +6,6 @@ sudo update-locale LANG=en_US.UTF-8 #DOCS:
 export APT_LISTCHANGES_FRONTEND=none #DOCS:
 export DEBIAN_FRONTEND=noninteractive #DOCS:
 
 export APT_LISTCHANGES_FRONTEND=none #DOCS:
 export DEBIAN_FRONTEND=noninteractive #DOCS:
 

-#

 # *Note:* these installation instructions are also available in executable
 #         form for use with vagrant under vagrant/Install-on-Ubuntu-20.sh.
 #
 # *Note:* these installation instructions are also available in executable
 #         form for use with vagrant under vagrant/Install-on-Ubuntu-20.sh.
 #


@@ -19,9 +18,9 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
 #
 
 #DOCS:    :::sh
 #
 
 #DOCS:    :::sh

-    sudo apt-get \
-        -o DPkg::options::="--force-confdef" -o DPkg::options::="--force-confold" \
-        --allow-downgrades --allow-remove-essential --allow-change-held-packages \
+    sudo apt-get \ #DOCS:
+        -o DPkg::options::="--force-confdef" -o DPkg::options::="--force-confold" \ #DOCS:
+        --allow-downgrades --allow-remove-essential --allow-change-held-packages \ #DOCS:

         -fuy install grub-pc #DOCS:
     sudo apt-get update -qq
 
         -fuy install grub-pc #DOCS:
     sudo apt-get update -qq
 


@@ -36,12 +35,6 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
                             php-intl python3-setuptools python3-dev python3-pip \
                             python3-psycopg2 python3-tidylib git
 
                             php-intl python3-setuptools python3-dev python3-pip \
                             python3-psycopg2 python3-tidylib git
 

-# If you want to run the test suite, you need to install the following
-# additional packages:
-
-    sudo apt-get install -y phpunit php-codesniffer php-cgi
-
-    pip3 install --user behave nose

 #
 # System Configuration
 # ====================
 #
 # System Configuration
 # ====================


@@ -169,4 +162,4 @@ EOF
 
 
 # Nominatim is now ready to use. Continue with
 
 
 # Nominatim is now ready to use. Continue with

-# [importing a database from OSM data](../admin/Import-and-Update.md).
+# [importing a database from OSM data](../admin/Import.md).