change to release download instructions

This commit is contained in:
Sarah Hoffmann
2020-06-06 20:54:59 +02:00
parent a0e7d80daf
commit 3dd182a915
4 changed files with 25 additions and 46 deletions

View File

@@ -159,23 +159,16 @@ sudo sed -i 's:#.*::' /etc/httpd/conf.d/nominatim.conf #DOCS:
# Building and Configuration # Building and Configuration
# -------------------------- # --------------------------
# #
# Get the source code from Github and change into the source directory # Get the source code for the release and unpack it
# #
if [ "x$1" == "xyes" ]; then #DOCS: :::sh if [ "x$1" == "xyes" ]; then #DOCS: :::sh
cd $USERHOME cd $USERHOME
git clone --recursive git://github.com/openstreetmap/Nominatim.git wget https://nominatim.org/release/Nominatim-3.5.0.tar.bz2
cd Nominatim tar xf Nominatim-3.5.0.tar.bz2
else #DOCS: else #DOCS:
cd $USERHOME/Nominatim #DOCS: cd $USERHOME/Nominatim #DOCS:
fi #DOCS: fi #DOCS:
# When installing the latest source from github, you also need to
# download the country grid:
if [ ! -f data/country_osm_grid.sql.gz ]; then #DOCS: :::sh
wget --no-verbose -O data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz
fi #DOCS:
# The code must be built in a separate directory. Create this directory, # The code must be built in a separate directory. Create this directory,
# then configure and build Nominatim in there: # then configure and build Nominatim in there:
@@ -183,7 +176,7 @@ fi #DOCS:
cd $USERHOME cd $USERHOME
mkdir build mkdir build
cd build cd build
cmake $USERHOME/Nominatim cmake $USERHOME/Nominatim-3.5.0
make make
# #
@@ -194,10 +187,10 @@ fi #DOCS:
# with a web server accessible from the Internet. At a minimum the # with a web server accessible from the Internet. At a minimum the
# following SELinux labeling should be done for Nominatim: # 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/Nominatim-3.5.0/(website|lib|settings)(/.*)?"
sudo semanage fcontext -a -t httpd_sys_content_t "$USERHOME/build/(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 semanage fcontext -a -t lib_t "$USERHOME/build/module/nominatim.so"
sudo restorecon -R -v $USERHOME/Nominatim sudo restorecon -R -v $USERHOME/Nominatim-3.5.0
sudo restorecon -R -v $USERHOME/build sudo restorecon -R -v $USERHOME/build

View File

@@ -153,23 +153,16 @@ sudo sed -i 's:#.*::' /etc/httpd/conf.d/nominatim.conf #DOCS:
# Building and Configuration # Building and Configuration
# -------------------------- # --------------------------
# #
# Get the source code from Github and change into the source directory # Get the source code for the release and unpack it
# #
if [ "x$1" == "xyes" ]; then #DOCS: :::sh if [ "x$1" == "xyes" ]; then #DOCS: :::sh
cd $USERHOME cd $USERHOME
git clone --recursive git://github.com/openstreetmap/Nominatim.git wget https://nominatim.org/release/Nominatim-3.5.0.tar.bz2
cd Nominatim tar xf Nominatim-3.5.0.tar.bz2
else #DOCS: else #DOCS:
cd $USERHOME/Nominatim #DOCS: cd $USERHOME/Nominatim #DOCS:
fi #DOCS: fi #DOCS:
# When installing the latest source from github, you also need to
# download the country grid:
if [ ! -f data/country_osm_grid.sql.gz ]; then #DOCS: :::sh
wget --no-verbose -O data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz
fi #DOCS:
# The code must be built in a separate directory. Create this directory, # The code must be built in a separate directory. Create this directory,
# then configure and build Nominatim in there: # then configure and build Nominatim in there:
@@ -177,7 +170,7 @@ fi #DOCS:
cd $USERHOME cd $USERHOME
mkdir build mkdir build
cd build cd build
cmake $USERHOME/Nominatim cmake $USERHOME/Nominatim-3.5.0
make make
# #
@@ -188,10 +181,10 @@ fi #DOCS:
# with a web server accessible from the Internet. At a minimum the # with a web server accessible from the Internet. At a minimum the
# following SELinux labeling should be done for Nominatim: # 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/Nominatim-3.5.0/(website|lib|settings)(/.*)?"
sudo semanage fcontext -a -t httpd_sys_content_t "$USERHOME/build/(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 semanage fcontext -a -t lib_t "$USERHOME/build/module/nominatim.so"
sudo restorecon -R -v $USERHOME/Nominatim sudo restorecon -R -v $USERHOME/Nominatim-3.5.0
sudo restorecon -R -v $USERHOME/build sudo restorecon -R -v $USERHOME/build

View File

@@ -108,14 +108,14 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
#DOCS:```sh #DOCS:```sh
sudo tee /etc/apache2/conf-available/nominatim.conf << EOFAPACHECONF sudo tee /etc/apache2/conf-available/nominatim.conf << EOFAPACHECONF
<Directory "$USERHOME/build/website"> #DOCS:<Directory "$USERHOME/Nominatim/build/website"> <Directory "$USERHOME/build/website">
Options FollowSymLinks MultiViews Options FollowSymLinks MultiViews
AddType text/html .php AddType text/html .php
DirectoryIndex search.php DirectoryIndex search.php
Require all granted Require all granted
</Directory> </Directory>
Alias /nominatim $USERHOME/build/website #DOCS:Alias /nominatim $USERHOME/Nominatim/build/website Alias /nominatim $USERHOME/build/website
EOFAPACHECONF EOFAPACHECONF
#DOCS:``` #DOCS:```
@@ -135,30 +135,23 @@ sudo sed -i 's:#.*::' /etc/apache2/conf-available/nominatim.conf #DOCS:
# Building and Configuration # Building and Configuration
# -------------------------- # --------------------------
# #
# Get the source code from Github and change into the source directory # Get the source code for the release and unpack it
# #
if [ "x$1" == "xyes" ]; then #DOCS: :::sh if [ "x$1" == "xyes" ]; then #DOCS: :::sh
cd $USERHOME cd $USERHOME
git clone --recursive git://github.com/openstreetmap/Nominatim.git wget https://nominatim.org/release/Nominatim-3.5.0.tar.bz2
cd Nominatim tar xf Nominatim-3.5.0.tar.bz2
else #DOCS: else #DOCS:
cd $USERHOME/Nominatim #DOCS: cd $USERHOME/Nominatim #DOCS:
fi #DOCS: fi #DOCS:
# When installing the latest source from github, you also need to
# download the country grid:
if [ ! -f data/country_osm_grid.sql.gz ]; then #DOCS: :::sh
wget -O data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz
fi #DOCS:
# The code must be built in a separate directory. Create this directory, # The code must be built in a separate directory. Create this directory,
# then configure and build Nominatim in there: # then configure and build Nominatim in there:
cd $USERHOME #DOCS: :::sh cd $USERHOME #DOCS: :::sh
mkdir build mkdir build
cd build cd build
cmake $USERHOME/Nominatim cmake $USERHOME/Nominatim-3.5.0
make make
# You need to create a minimal configuration file that tells nominatim # You need to create a minimal configuration file that tells nominatim

View File

@@ -109,14 +109,14 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
#DOCS:```sh #DOCS:```sh
sudo tee /etc/apache2/conf-available/nominatim.conf << EOFAPACHECONF sudo tee /etc/apache2/conf-available/nominatim.conf << EOFAPACHECONF
<Directory "$USERHOME/build/website"> #DOCS:<Directory "$USERHOME/Nominatim/build/website"> <Directory "$USERHOME/build/website">
Options FollowSymLinks MultiViews Options FollowSymLinks MultiViews
AddType text/html .php AddType text/html .php
DirectoryIndex search.php DirectoryIndex search.php
Require all granted Require all granted
</Directory> </Directory>
Alias /nominatim $USERHOME/build/website #DOCS:Alias /nominatim $USERHOME/Nominatim/build/website Alias /nominatim $USERHOME/build/website
EOFAPACHECONF EOFAPACHECONF
#DOCS:``` #DOCS:```
@@ -136,12 +136,12 @@ sudo sed -i 's:#.*::' /etc/apache2/conf-available/nominatim.conf #DOCS:
# Building and Configuration # Building and Configuration
# -------------------------- # --------------------------
# #
# Get the source code from Github and change into the source directory # Get the source code for the release and unpack it
# #
if [ "x$1" == "xyes" ]; then #DOCS: :::sh if [ "x$1" == "xyes" ]; then #DOCS: :::sh
cd $USERHOME cd $USERHOME
git clone --recursive git://github.com/openstreetmap/Nominatim.git wget https://nominatim.org/release/Nominatim-3.5.0.tar.bz2
cd Nominatim tar xf Nominatim-3.5.0.tar.bz2
else #DOCS: else #DOCS:
cd $USERHOME/Nominatim #DOCS: cd $USERHOME/Nominatim #DOCS:
fi #DOCS: fi #DOCS:
@@ -156,10 +156,10 @@ fi #DOCS:
# The code must be built in a separate directory. Create this directory, # The code must be built in a separate directory. Create this directory,
# then configure and build Nominatim in there: # then configure and build Nominatim in there:
cd $USERHOME #DOCS: :::sh cd $USERHOME
mkdir build mkdir build
cd build cd build
cmake $USERHOME/Nominatim cmake $USERHOME/Nominatim-3.5.0
make make
# You need to create a minimal configuration file that tells nominatim # You need to create a minimal configuration file that tells nominatim