X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/8c3a0efe8b75a06279998e66a932d8a56c483961..e37cfc64d2734bf67aedf44e57585d6bd5ff06af:/vagrant/Install-on-Centos-8.sh
diff --git a/vagrant/Install-on-Centos-8.sh b/vagrant/Install-on-Centos-8.sh
index fdfec24b..c9278f9e 100755
--- a/vagrant/Install-on-Centos-8.sh
+++ b/vagrant/Install-on-Centos-8.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -ex
#
# *Note:* these installation instructions are also available in executable
# form for use with vagrant under `vagrant/Install-on-Centos-8.sh`.
@@ -18,41 +18,28 @@
sudo dnf install -y epel-release redhat-rpm-config
# EPEL contains Postgres 9.6 and 10, but not PostGIS. Postgres 9.4+/10/11/12
-# and PostGIS 2.4/2.5/3.0 are availble from postgresql.org
+# and PostGIS 2.4/2.5/3.0 are availble from postgresql.org. Enable these
+# repositories and make sure, the binaries can be found:
sudo dnf -qy module disable postgresql
sudo dnf install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm
+ export PATH=/usr/pgsql-12/bin:$PATH
# 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
+ python3-psycopg2 \
+ expat-devel zlib-devel libicu-devel
- # make sure pg_config gets found
- echo 'PATH=/usr/pgsql-10/bin:$PATH' >> ~/.bash_profile
- source ~/.bash_profile
+ pip3 install --user python-dotenv psutil Jinja2 PyICU datrie pyyaml
- 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
@@ -70,16 +57,19 @@
# we assume this user is called nominatim and the installation will be in
# /srv/nominatim. To create the user and directory run:
#
-sudo mkdir -p /srv/nominatim #DOCS: sudo useradd -d /srv/nominatim -s /bin/bash -m nominatim
-sudo chown vagrant /srv/nominatim #DOCS:
+# sudo useradd -d /srv/nominatim -s /bin/bash -m nominatim
#
# You may find a more suitable location if you wish.
#
# To be able to copy and paste instructions from this manual, export
# user name and home directory now like this:
#
- export USERNAME=vagrant #DOCS: export USERNAME=nominatim
+if [ "x$USERNAME" == "x" ]; then #DOCS:
+ export USERNAME=vagrant #DOCS: export USERNAME=nominatim
export USERHOME=/srv/nominatim
+ sudo mkdir -p /srv/nominatim #DOCS:
+ sudo chown vagrant /srv/nominatim #DOCS:
+fi #DOCS:
#
# **Never, ever run the installation as a root user.** You have been warned.
#
@@ -91,21 +81,29 @@ 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:
-
-
- sudo /usr/pgsql-10/bin/postgresql-10-setup initdb
- sudo systemctl enable postgresql-10
-
-#
-# Next tune the postgresql configuration, which is located in
-# `/var/lib/pgsql/data/postgresql.conf`. See section *Postgres Tuning* in
+# with initializing the database:
+
+if [ "x$NOSYSTEMD" == "xyes" ]; then #DOCS:
+ sudo -u postgres /usr/pgsql-12/bin/pg_ctl initdb -D /var/lib/pgsql/12/data #DOCS:
+ sudo mkdir /var/log/postgresql #DOCS:
+ sudo chown postgres. /var/log/postgresql #DOCS:
+else #DOCS:
+ sudo /usr/pgsql-12/bin/postgresql-12-setup initdb
+fi #DOCS:
+#
+# Next tune the postgresql configuration, which is located in
+# `/var/lib/pgsql/12/data/postgresql.conf`. See section *Postgres Tuning* in
# [the installation page](../admin/Installation.md#postgresql-tuning)
# for the parameters to change.
#
-# 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
+if [ "x$NOSYSTEMD" == "xyes" ]; then #DOCS:
+ sudo -u postgres /usr/pgsql-12/bin/pg_ctl -D /var/lib/pgsql/12/data -l /var/log/postgresql/postgresql-12.log start #DOCS:
+else #DOCS:
+ sudo systemctl enable postgresql-12
+ sudo systemctl restart postgresql-12
+fi #DOCS:
#
# Finally, we need to add two postgres users: one for the user that does
@@ -116,36 +114,6 @@ sudo chown vagrant /srv/nominatim #DOCS:
sudo -u postgres createuser -s $USERNAME
sudo -u postgres createuser apache
-#
-# Setting up the Apache Webserver
-# -------------------------------
-#
-# You need to create an alias to the website directory in your apache
-# configuration. Add a separate nominatim configuration to your webserver:
-
-#DOCS:```sh
-sudo tee /etc/httpd/conf.d/nominatim.conf << EOFAPACHECONF
-
- Options FollowSymLinks MultiViews
- AddType text/html .php
- DirectoryIndex search.php
- Require all granted
-
-
-Alias /nominatim $USERHOME/build/website
-EOFAPACHECONF
-#DOCS:```
-
-sudo sed -i 's:#.*::' /etc/httpd/conf.d/nominatim.conf #DOCS:
-
-#
-# Then reload apache
-#
-
- sudo systemctl enable httpd
- sudo systemctl restart httpd
-
-
#
# Installing Nominatim
# ====================
@@ -157,7 +125,7 @@ sudo sed -i 's:#.*::' /etc/httpd/conf.d/nominatim.conf #DOCS:
#
if [ "x$1" == "xyes" ]; then #DOCS: :::sh
cd $USERHOME
- git clone --recursive git://github.com/openstreetmap/Nominatim.git
+ git clone --recursive https://github.com/openstreetmap/Nominatim.git
cd Nominatim
else #DOCS:
cd $USERHOME/Nominatim #DOCS:
@@ -174,11 +142,52 @@ fi #DOCS:
# then configure and build Nominatim in there:
#DOCS: :::sh
- cd $USERHOME
- mkdir build
- cd build
+ mkdir $USERHOME/build
+ cd $USERHOME/build
cmake $USERHOME/Nominatim
make
+ sudo make install
+
+#
+# Setting up the Apache Webserver
+# -------------------------------
+#
+# The webserver should serve the php scripts from the website directory of your
+# [project directory](../admin/Import.md#creating-the-project-directory).
+# This directory needs to exist when the webserver is configured.
+# Therefore set up a project directory and create the website directory:
+#
+ mkdir $USERHOME/nominatim-project
+ mkdir $USERHOME/nominatim-project/website
+#
+# You need to create an alias to the website directory in your apache
+# configuration. Add a separate nominatim configuration to your webserver:
+
+#DOCS:```sh
+sudo tee /etc/httpd/conf.d/nominatim.conf << EOFAPACHECONF
+
+ Options FollowSymLinks MultiViews
+ AddType text/html .php
+ DirectoryIndex search.php
+ Require all granted
+
+
+Alias /nominatim $USERHOME/nominatim-project/website
+EOFAPACHECONF
+#DOCS:```
+
+sudo sed -i 's:#.*::' /etc/httpd/conf.d/nominatim.conf #DOCS:
+
+#
+# Then reload apache:
+#
+
+if [ "x$NOSYSTEMD" == "xyes" ]; then #DOCS:
+ sudo httpd #DOCS:
+else #DOCS:
+ sudo systemctl enable httpd
+ sudo systemctl restart httpd
+fi #DOCS:
#
# Adding SELinux Security Settings
@@ -188,24 +197,21 @@ fi #DOCS:
# with a web server accessible from the Internet. At a minimum the
# following SELinux labeling should be done for Nominatim:
- sudo semanage fcontext -a -t httpd_sys_content_t "$USERHOME/Nominatim/(website|lib|settings)(/.*)?"
- sudo semanage fcontext -a -t httpd_sys_content_t "$USERHOME/build/(website|lib|settings)(/.*)?"
- sudo semanage fcontext -a -t lib_t "$USERHOME/build/module/nominatim.so"
- sudo restorecon -R -v $USERHOME/Nominatim
- sudo restorecon -R -v $USERHOME/build
-
+if [ "x$HAVE_SELINUX" != "xno" ]; then #DOCS:
+ sudo semanage fcontext -a -t httpd_sys_content_t "/usr/local/nominatim/lib/lib-php(/.*)?"
+ sudo semanage fcontext -a -t httpd_sys_content_t "$USERHOME/nominatim-project/website(/.*)?"
+ sudo semanage fcontext -a -t lib_t "$USERHOME/nominatim-project/module/nominatim.so"
+ sudo restorecon -R -v /usr/local/lib/nominatim
+ sudo restorecon -R -v $USERHOME/nominatim-project
+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
-