Merge pull request #1962 from mtmail/travis-ci-without-webserver

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

diff --git a/vagrant/Install-on-Centos-8.sh b/vagrant/Install-on-Centos-8.sh
index fdfec24b2f4ee52e09b91dfb95f6c0b55538f157..75b7a558c8617be69cc4b0e2afd175c5f8693e8d 100755 (executable)
--- a/vagrant/Install-on-Centos-8.sh
+++ b/vagrant/Install-on-Centos-8.sh
@@ -26,33 +26,21 @@
 # Now you can install all packages needed for Nominatim:
 
 #DOCS:    :::sh
 # Now you can install all packages needed for Nominatim:
 
 #DOCS:    :::sh

-    sudo dnf --enablerepo=PowerTools install -y postgresql10-server \
-                        postgresql10-contrib postgresql10-devel postgis25_10 \
+    sudo dnf --enablerepo=PowerTools install -y postgresql12-server \
+                        postgresql12-contrib postgresql12-devel postgis30_12 \

                         wget git cmake make gcc gcc-c++ libtool policycoreutils-python-utils \
                         llvm-toolset ccache clang-tools-extra \
                         php-pgsql php php-intl php-json libpq-devel \
                         wget git cmake make gcc gcc-c++ libtool policycoreutils-python-utils \
                         llvm-toolset ccache clang-tools-extra \
                         php-pgsql php php-intl php-json libpq-devel \

-                        proj52-epsg bzip2-devel proj-devel boost-devel \
+                        bzip2-devel proj-devel boost-devel \

                         python3-pip python3-setuptools python3-devel \
                         expat-devel zlib-devel
 
     # make sure pg_config gets found
                         python3-pip python3-setuptools python3-devel \
                         expat-devel zlib-devel
 
     # make sure pg_config gets found

-    echo 'PATH=/usr/pgsql-10/bin:$PATH' >> ~/.bash_profile
+    echo 'PATH=/usr/pgsql-12/bin:$PATH' >> ~/.bash_profile

     source ~/.bash_profile
 
     pip3 install --user psycopg2 pytidylib
 
     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 dnf 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


@@ -94,8 +82,8 @@ sudo chown vagrant /srv/nominatim  #DOCS:
 # with initializing the database, then enable the server to start at boot:
 
 
 # with initializing the database, then enable the server to start at boot:
 
 

-    sudo /usr/pgsql-10/bin/postgresql-10-setup initdb
-    sudo systemctl enable postgresql-10
+    sudo /usr/pgsql-12/bin/postgresql-12-setup initdb
+    sudo systemctl enable postgresql-12

 
 #
 # Next tune the postgresql configuration, which is located in 
 
 #
 # Next tune the postgresql configuration, which is located in 


@@ -105,7 +93,7 @@ sudo chown vagrant /srv/nominatim  #DOCS:
 #
 # Now start the postgresql service after updating this config file.
 
 #
 # Now start the postgresql service after updating this config file.
 

-    sudo systemctl restart postgresql-10
+    sudo systemctl restart postgresql-12

 
 #
 # Finally, we need to add two postgres users: one for the user that does
 
 #
 # Finally, we need to add two postgres users: one for the user that does


@@ -208,4 +196,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).