Merge pull request #1792 from lonvia/remove-from-location-area

[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 b456fb74fd1fb6dfc12f752abb2a5e70fadac387..e2592f6591412f3cf9284a14564a87c667821b10 100755 (executable)
--- a/vagrant/Install-on-Centos-7.sh
+++ b/vagrant/Install-on-Centos-7.sh
@@ -23,6 +23,12 @@
     sudo yum install -y https://download.postgresql.org/pub/repos/yum/11/redhat/rhel-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm
     sudo yum install -y centos-release-scl-rh
 
+# More repositories for PHP 7 (default is PHP 5.4)
+
+    sudo yum install -y http://rpms.remirepo.net/enterprise/remi-release-7.rpm
+    sudo yum-config-manager --enable remi-php72
+    sudo yum update -y
+
 # Now you can install all packages needed for Nominatim:
 
 #DOCS:    :::sh
@@ -32,20 +38,29 @@
                         wget git cmake make gcc gcc-c++ libtool policycoreutils-python \
                         devtoolset-7 llvm-toolset-7 \
                         php-pgsql php php-intl libpqxx-devel \
-                        proj-epsg bzip2-devel proj-devel libxml2-devel boost-devel \
+                        proj-epsg bzip2-devel proj-devel boost-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 pytidylib
+
 # If you want to run the test suite, you need to install the following
 # additional packages:
 
 #DOCS:    :::sh
-    sudo yum install -y python34-pip python34-setuptools python34-devel \
-                        php-phpunit-PHPUnit
-    pip3 install --user behave nose pytidylib psycopg2
+    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
 # ====================
@@ -85,9 +100,6 @@ sudo chown vagrant /srv/nominatim  #DOCS:
 # CentOS does not automatically create a database cluster. Therefore, start
 # with initializing the database, then enable the server to start at boot:
 
-    echo 'PATH=$PATH:/usr/pgsql-11/bin' > .bash_profile
-    source .bash_profile
-
     sudo /usr/pgsql-11/bin/postgresql-11-setup initdb
     sudo systemctl enable postgresql-11