improve syntax highlighting for vagrant scripts

This commit is contained in:
Sarah Hoffmann 2018-01-15 23:47:00 +01:00
parent 86833454a4
commit d4110eef7e
3 changed files with 16 additions and 14 deletions

View File

@ -13,3 +13,6 @@ pages:
- 'Appendix':
- 'Installation on CentOS 7' : 'appendix/Install-on-Centos-7.md'
- 'Installation on Ubuntu 16' : 'appendix/Install-on-Ubuntu-16.md'
markdown_extensions:
- codehilite:
use_pygments: False

View File

@ -19,6 +19,7 @@
# Now you can install all packages needed for Nominatim:
#DOCS: :::sh
sudo yum install -y postgresql-server postgresql-contrib postgresql-devel \
postgis postgis-utils \
git cmake make gcc gcc-c++ libtool policycoreutils-python \
@ -29,6 +30,7 @@
# If you want to run the test suite, you need to install the following
# additional packages:
#DOCS: :::sh
sudo yum install -y python34-pip python34-setuptools python34-devel \
php-phpunit-PHPUnit
pip3 install --user behave nose pytidylib psycopg2
@ -101,7 +103,7 @@
# You need to create an alias to the website directory in your apache
# configuration. Add a separate nominatim configuration to your webserver:
#DOCS:```
#DOCS:```sh
sudo tee /etc/httpd/conf.d/nominatim.conf << EOFAPACHECONF
<Directory "$USERHOME/build/website"> #DOCS:<Directory "$USERHOME/Nominatim/build/website">
Options FollowSymLinks MultiViews
@ -143,12 +145,10 @@ sudo sed -i 's:#.*::' /etc/httpd/conf.d/nominatim.conf #DOCS:
#
# Get the source code from Github and change into the source directory
#
if [ "x$1" == "xyes" ]; then #DOCS:
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:
@ -156,14 +156,14 @@ 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:
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:
cd $USERHOME #DOCS: :::sh
mkdir build
cd build
cmake $USERHOME/Nominatim
@ -172,7 +172,7 @@ 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:
#DOCS:```
#DOCS:```sh
tee settings/local.php << EOF
<?php
@define('CONST_Database_Web_User', 'apache');

View File

@ -18,6 +18,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
# 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
@ -100,7 +101,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS:
# You need to create an alias to the website directory in your apache
# configuration. Add a separate nominatim configuration to your webserver:
#DOCS:```
#DOCS:```sh
sudo tee /etc/apache2/conf-available/nominatim.conf << EOFAPACHECONF
<Directory "$USERHOME/build/website"> #DOCS:<Directory "$USERHOME/Nominatim/build/website">
Options FollowSymLinks MultiViews
@ -131,12 +132,10 @@ sudo sed -i 's:#.*::' /etc/apache2/conf-available/nominatim.conf #DOCS:
#
# Get the source code from Github and change into the source directory
#
if [ "x$1" == "xyes" ]; then #DOCS:
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:
@ -144,14 +143,14 @@ 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:
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:
cd $USERHOME #DOCS: :::sh
mkdir build
cd build
cmake $USERHOME/Nominatim
@ -160,7 +159,7 @@ fi #DOCS:
# You need to create a minimal configuration file that tells nominatim
# where it is located on the webserver:
#DOCS:```
#DOCS:```sh
tee settings/local.php << EOF
<?php
@define('CONST_Website_BaseURL', '/nominatim/');