correct parameter name in query CLI

[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 9c4972dc50265c80a6f1ef5b28b8b3186d02764b..548f8c9caf76d33a3dab14c2ee6bac1655b3e1be 100755 (executable)
--- a/vagrant/Install-on-Centos-8.sh
+++ b/vagrant/Install-on-Centos-8.sh
@@ -26,32 +26,17 @@
 # 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 \
-                        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
-    echo 'PATH=/usr/pgsql-10/bin:$PATH' >> ~/.bash_profile
-    source ~/.bash_profile
+    pip3 install --user psycopg2 python-dotenv
 
-# If you want to run the test suite, you need to install the following
-# additional packages:
-
-#DOCS:    :::sh
-    sudo dnf install -y python36 python3-pip python3-setuptools python36-devel \
-                        php-dom php-mbstring
-
-    pip3 install --user behave nose pytidylib psycopg2
-
-    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
@@ -93,8 +78,8 @@ sudo chown vagrant /srv/nominatim  #DOCS:
 # 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 
@@ -104,7 +89,7 @@ sudo chown vagrant /srv/nominatim  #DOCS:
 #
 # 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
@@ -195,16 +180,12 @@ fi                                 #DOCS:
 
 
 # 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
-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
-# [importing a database from OSM data](../admin/Import-and-Update.md).
+# [importing a database from OSM data](../admin/Import.md).