Commit 27c470c3 authored by Felix Delattre's avatar Felix Delattre
Browse files

Improved configuration files

parent 6f93441f
......@@ -120,22 +120,22 @@ jobs:
- name: Set up Apache HTTP Server
run: |
sudo mkdir --parents /run/renderd /var/cache/renderd/tiles
mkdir --parents examples/example-map/leaflet
mkdir --parents utils/example-map/leaflet
curl --silent "https://unpkg.com/leaflet@1.7.1/dist/leaflet.js" \
> examples/example-map/leaflet/leaflet.min.js
> utils/example-map/leaflet/leaflet.min.js
curl --silent "https://unpkg.com/leaflet@1.7.1/dist/leaflet.css" \
> examples/example-map/leaflet/leaflet.css
> utils/example-map/leaflet/leaflet.css
sudo ln --symbolic \
"${PWD}/examples/example-map" \
"${PWD}/utils/example-map" \
/var/www/
sudo ln --symbolic \
"${PWD}/examples/config/renderd/renderd.conf.dist" \
"${PWD}/etc/renderd/renderd.conf.examples" \
/etc/renderd.conf
sudo ln --symbolic \
"${PWD}/examples/config/apache2/renderd.conf.dist" \
"${PWD}/etc/apache2/renderd.conf" \
/etc/apache2/conf-enabled/renderd.conf
sudo ln --symbolic \
"${PWD}/examples/config/apache2/renderd-example-map.conf.dist" \
"${PWD}/etc/apache2/renderd-example-map.conf" \
/etc/apache2/conf-enabled/renderd-example-map.conf
echo "LoadModule tile_module /usr/lib/apache2/modules/mod_tile.so" \
| sudo tee --append /etc/apache2/mods-enabled/mod_tile.load
......
......@@ -48,7 +48,7 @@ renderd_SOURCES = \
$(STORE_SOURCES)
renderd_CXXFLAGS = $(MAPNIK_CFLAGS)
renderd_LDADD = $(PTHREAD_CFLAGS) $(MAPNIK_LDFLAGS) $(STORE_LDFLAGS) -liniparser
renderd_DATA = renderd.conf
renderd_DATA = etc/renderd/renderd.conf
render_speedtest_SOURCES = \
src/speedtest.cpp \
......
......@@ -90,7 +90,7 @@ Configuration
After you either installed the software packages or copiled the software
yourself, you can continue with the configuration. For your convenience
example configuration files are distributed with the software packages and
located in the ``examples/config`` directory of this repository.
located in the ``etc`` directory of this repository.
A very basic example-map and data can be found in the ``example-map``
directory. For a simple test copy it over to ``/var/www/example-map``.
......@@ -99,9 +99,9 @@ Copy the configuration files to their place, too:
::
$ cp examples/config/renderd.conf.dist /etc/renderd.conf
$ cp examples/config/apache2/renderd.conf.dist /etc/apache2/conf-available/renderd.conf
$ cp examples/config/apache2/renderd-example-map.conf.dist /etc/apache2/conf-available/renderd-example-map.conf
$ cp etc/renderd/renderd.conf /etc/renderd.conf
$ cp etc/apache2/renderd.conf /etc/apache2/conf-available/renderd.conf
$ cp etc/apache2/renderd-example-map.conf /etc/apache2/conf-available/renderd-example-map.conf
Enable the configuration:
......
Alias /mod_tile /var/cache/renderd/tiles
<Directory /var/cache/renderd/tiles>
Options Indexes FollowSymLinks MultiViews
......
......@@ -7,7 +7,7 @@ num_threads=4
tile_dir=/var/cache/renderd/tiles
[mapnik]
plugins_dir=/usr/lib/mapnik/3.0/input
plugins_dir=/usr/lib/mapnik/3.1/input
font_dir=/usr/share/fonts/truetype
font_dir_recurse=true
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment