X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/2ab9e4acd3a2ceb5ff871b6b6afc786377e8739f..16bb0071350f66ff67308c5d33ae95dc1f2341ea:/vagrant/Install-on-Centos-8.sh
diff --git a/vagrant/Install-on-Centos-8.sh b/vagrant/Install-on-Centos-8.sh
index fdfec24b..788f5aa2 100755
--- a/vagrant/Install-on-Centos-8.sh
+++ b/vagrant/Install-on-Centos-8.sh
@@ -26,33 +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
+ expat-devel zlib-devel libicu-dev
- # make sure pg_config gets found
- echo 'PATH=/usr/pgsql-10/bin:$PATH' >> ~/.bash_profile
- source ~/.bash_profile
+ pip3 install --user psycopg2 python-dotenv psutil Jinja2 PyICU
- 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
@@ -94,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
@@ -105,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
@@ -116,36 +100,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
# ====================
@@ -174,11 +128,48 @@ 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).
+# Therefore set up a project directory and populate the website directory:
+#
+ mkdir $USERHOME/nominatim-project
+ cd $USERHOME/nominatim-project
+ nominatim refresh --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
+#
+
+ sudo systemctl enable httpd
+ sudo systemctl restart httpd
#
# Adding SELinux Security Settings
@@ -188,24 +179,20 @@ 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
+ 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
# 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
-