Merge pull request #2147 from lonvia/tests-for-python-code

[nominatim.git] / vagrant / Install-on-Centos-7.sh

diff --git a/vagrant/Install-on-Centos-7.sh b/vagrant/Install-on-Centos-7.sh
index e2592f6591412f3cf9284a14564a87c667821b10..009152727e3cb7b9150865778ad4023030ddbf5e 100755 (executable)
--- a/vagrant/Install-on-Centos-7.sh
+++ b/vagrant/Install-on-Centos-7.sh
@@ -42,24 +42,8 @@
                         python3-pip python3-setuptools python3-devel \
                         expat-devel zlib-devel
 
                         python3-pip python3-setuptools python3-devel \
                         expat-devel zlib-devel
 

-    # make sure pg_config gets found
-    echo 'PATH=/usr/pgsql-11/bin/:$PATH' >> ~/.bash_profile
-    source ~/.bash_profile
+    pip3 install --user psycopg2 python-dotenv

 
 

-    pip3 install --user psycopg2 pytidylib
-
-# If you want to run the test suite, you need to install the following
-# additional packages:
-
-#DOCS:    :::sh
-    sudo yum install -y php-dom php-mbstring
-    pip3 install --user behave nose
-
-    composer global require "squizlabs/php_codesniffer=*"
-    sudo ln -s ~/.config/composer/vendor/bin/phpcs /usr/bin/
-
-    composer global require "phpunit/phpunit=7.*"
-    sudo ln -s ~/.config/composer/vendor/bin/phpunit /usr/bin/

 
 #
 # System Configuration
 
 #
 # System Configuration


@@ -202,16 +186,12 @@ fi                                 #DOCS:
 
 
 # You need to create a minimal configuration file that tells nominatim
 
 
 # You need to create a minimal configuration file that tells nominatim

-# the name of your webserver user and the URL of the website:
+# the name of your webserver user:

 
 #DOCS:```sh
 
 #DOCS:```sh

-tee settings/local.php << EOF
-<?php
- @define('CONST_Database_Web_User', 'apache');
- @define('CONST_Website_BaseURL', '/nominatim/');
-EOF
+echo NOMINATIM_DATABASE_WEBUSER="apache" | tee .env

 #DOCS:```
 
 
 # Nominatim is now ready to use. Continue with
 #DOCS:```
 
 
 # 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).