From 42f6371e474cd8315a7c580b7e15b25ab4c19923 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Thu, 7 May 2020 21:55:04 +0200 Subject: [PATCH] remove Ubuntu 16 installation instructions Also fixes up CentOS 8 links in documentation. --- docs/CMakeLists.txt | 2 +- docs/admin/Installation.md | 2 +- docs/mkdocs.yml | 3 +- vagrant/Install-on-Ubuntu-16.sh | 176 -------------------------------- 4 files changed, 4 insertions(+), 179 deletions(-) delete mode 100755 vagrant/Install-on-Ubuntu-16.sh diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 5361d12f..4c7cbabc 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -41,7 +41,7 @@ execute_process( ADD_CUSTOM_TARGET(doc COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/bash2md.sh ${PROJECT_SOURCE_DIR}/vagrant/Install-on-Centos-7.sh ${CMAKE_CURRENT_BINARY_DIR}/appendix/Install-on-Centos-7.md - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/bash2md.sh ${PROJECT_SOURCE_DIR}/vagrant/Install-on-Ubuntu-16.sh ${CMAKE_CURRENT_BINARY_DIR}/appendix/Install-on-Ubuntu-16.md + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/bash2md.sh ${PROJECT_SOURCE_DIR}/vagrant/Install-on-Centos-8.sh ${CMAKE_CURRENT_BINARY_DIR}/appendix/Install-on-Centos-8.md COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/bash2md.sh ${PROJECT_SOURCE_DIR}/vagrant/Install-on-Ubuntu-18.sh ${CMAKE_CURRENT_BINARY_DIR}/appendix/Install-on-Ubuntu-18.md COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/bash2md.sh ${PROJECT_SOURCE_DIR}/vagrant/Install-on-Ubuntu-20.sh ${CMAKE_CURRENT_BINARY_DIR}/appendix/Install-on-Ubuntu-20.md COMMAND mkdocs build -d ${CMAKE_CURRENT_BINARY_DIR}/../site-html -f ${CMAKE_CURRENT_BINARY_DIR}/../mkdocs.yml diff --git a/docs/admin/Installation.md b/docs/admin/Installation.md index 765b2716..a02b48e2 100644 --- a/docs/admin/Installation.md +++ b/docs/admin/Installation.md @@ -6,7 +6,7 @@ the following operating systems: * [Ubuntu 20.04](../appendix/Install-on-Ubuntu-20.md) * [Ubuntu 18.04](../appendix/Install-on-Ubuntu-18.md) - * [Ubuntu 16.04](../appendix/Install-on-Ubuntu-16.md) + * [CentOS 8](../appendix/Install-on-Centos-8.md) * [CentOS 7.2](../appendix/Install-on-Centos-7.md) These OS-specific instructions can also be found in executable form diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml index d0925b7e..88663f8b 100644 --- a/docs/mkdocs.yml +++ b/docs/mkdocs.yml @@ -34,8 +34,9 @@ pages: - 'Wikipedia & Wikidata': 'data-sources/Wikipedia-Wikidata.md' - 'Appendix': - 'Installation on CentOS 7' : 'appendix/Install-on-Centos-7.md' - - 'Installation on Ubuntu 16' : 'appendix/Install-on-Ubuntu-16.md' + - 'Installation on CentOS 8' : 'appendix/Install-on-Centos-8.md' - 'Installation on Ubuntu 18' : 'appendix/Install-on-Ubuntu-18.md' + - 'Installation on Ubuntu 20' : 'appendix/Install-on-Ubuntu-20.md' markdown_extensions: - codehilite - admonition diff --git a/vagrant/Install-on-Ubuntu-16.sh b/vagrant/Install-on-Ubuntu-16.sh deleted file mode 100755 index 393cd0b1..00000000 --- a/vagrant/Install-on-Ubuntu-16.sh +++ /dev/null @@ -1,176 +0,0 @@ -#!/bin/bash -# -# hacks for broken vagrant box #DOCS: -sudo rm -f /var/lib/dpkg/lock #DOCS: -sudo update-locale LANG=en_US.UTF-8 #DOCS: -export APT_LISTCHANGES_FRONTEND=none #DOCS: -export DEBIAN_FRONTEND=noninteractive #DOCS: - -# -# *Note:* these installation instructions are also available in executable -# form for use with vagrant under vagrant/Install-on-Ubuntu-16.sh. -# -# Installing the Required Software -# ================================ -# -# These instructions expect that you have a freshly installed Ubuntu 16.04. -# -# Make sure all packages are are up-to-date by running: -# - -#DOCS: :::sh - sudo apt-get -o DPkg::options::="--force-confdef" -o DPkg::options::="--force-confold" --force-yes -fuy install grub-pc #DOCS: - sudo apt-get update -qq - -# Now you can install all packages needed for Nominatim: - - sudo apt-get install -y build-essential cmake g++ libboost-dev libboost-system-dev \ - libboost-filesystem-dev libexpat1-dev zlib1g-dev\ - libbz2-dev libpq-dev libproj-dev \ - postgresql-server-dev-9.5 postgresql-9.5-postgis-2.2 \ - postgresql-contrib-9.5 \ - apache2 php php-pgsql libapache2-mod-php \ - php-intl python3-setuptools python3-dev python3-pip \ - python3-tidylib python3-psycopg2 git - -# If you want to run the test suite, you need to install the following -# additional packages: - - sudo apt-get install -y php-cgi 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=6.*" - sudo ln -s ~/.config/composer/vendor/bin/phpunit /usr/bin/ - -# -# System Configuration -# ==================== -# -# The following steps are meant to configure a fresh Ubuntu installation -# for use with Nominatim. You may skip some of the steps if you have your -# OS already configured. -# -# Creating Dedicated User Accounts -# -------------------------------- -# -# Nominatim will run as a global service on your machine. It is therefore -# best to install it under its own separate user account. In the following -# we assume this user is called nominatim and the installation will be in -# /srv/nominatim. To create the user and directory run: -# -# 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 - export USERHOME=/home/vagrant #DOCS: export USERHOME=/srv/nominatim -# -# **Never, ever run the installation as a root user.** You have been warned. -# -# Make sure that system servers can read from the home directory: - - chmod a+x $USERHOME - -# Setting up PostgreSQL -# --------------------- -# -# Tune the postgresql configuration, which is located in -# `/etc/postgresql/9.5/main/postgresql.conf`. See section *Postgres Tuning* in -# [the installation page](../admin/Installation.md#postgresql-tuning) -# for the parameters to change. -# -# Restart the postgresql service after updating this config file. - - sudo systemctl restart postgresql - -# -# Finally, we need to add two postgres users: one for the user that does -# the import and another for the webserver which should access the database -# for reading only: -# - - sudo -u postgres createuser -s $USERNAME - sudo -u postgres createuser www-data - -# -# 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/apache2/conf-available/nominatim.conf << EOFAPACHECONF - #DOCS: - Options FollowSymLinks MultiViews - AddType text/html .php - DirectoryIndex search.php - Require all granted - - -Alias /nominatim $USERHOME/build/website #DOCS:Alias /nominatim $USERHOME/Nominatim/build/website -EOFAPACHECONF -#DOCS:``` - -sudo sed -i 's:#.*::' /etc/apache2/conf-available/nominatim.conf #DOCS: - -# -# Then enable the configuration and restart apache -# - - sudo a2enconf nominatim - sudo systemctl restart apache2 - -# -# Installing Nominatim -# ==================== -# -# Building and Configuration -# -------------------------- -# -# Get the source code from Github and change into the source directory -# -if [ "x$1" == "xyes" ]; then #DOCS: :::sh - cd $USERHOME - git clone --recursive git://github.com/openstreetmap/Nominatim.git - cd Nominatim -else #DOCS: - cd $USERHOME/Nominatim #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, -# then configure and build Nominatim in there: - - cd $USERHOME #DOCS: :::sh - mkdir build - cd build - cmake $USERHOME/Nominatim - make - -# You need to create a minimal configuration file that tells nominatim -# where it is located on the webserver: - -#DOCS:```sh -tee settings/local.php << EOF -