From 13a198d06d47ab620b652fdcd96399d9a2643889 Mon Sep 17 00:00:00 2001 From: Hummeltech <6109326+hummeltech@users.noreply.github.com> Date: Sat, 16 Mar 2024 14:57:19 -0700 Subject: [PATCH] Updated Docs/Dockerfiles/GitHub actions after switching CMake to relative install paths (#412) --- .github/actions/cmake/build/action.yml | 5 ++++- .github/workflows/build-and-test.yml | 3 +++ .github/workflows/install-package-and-test.yml | 2 +- CMakeLists.txt | 2 +- README.rst | 4 ++-- configure.ac | 2 +- docker/archlinux/Dockerfile | 8 +++++--- docker/centos/7/Dockerfile | 7 +++++-- docker/centos/stream/Dockerfile | 7 +++++-- docker/centos/stream/Dockerfile.mapnik-latest | 7 +++++-- docker/debian/Dockerfile | 7 +++++-- docker/fedora/Dockerfile | 7 +++++-- docker/opensuse/Dockerfile | 7 +++++-- docker/ubuntu/Dockerfile | 7 +++++-- docs/build/building_on_arch_linux.md | 6 +++++- docs/build/building_on_centos.md | 6 +++++- docs/build/building_on_centos_stream.md | 6 +++++- docs/build/building_on_debian.md | 6 +++++- docs/build/building_on_fedora.md | 6 +++++- docs/build/building_on_freebsd.md | 6 +++++- docs/build/building_on_macos.md | 6 +++++- docs/build/building_on_opensuse.md | 6 +++++- docs/build/building_on_ubuntu.md | 6 +++++- docs/man/convert_meta.1 | 2 +- docs/man/openstreetmap-tiles-update-expire.1 | 2 +- docs/man/render_expired.1 | 2 +- docs/man/render_list.1 | 4 ++-- docs/man/render_old.1 | 2 +- docs/man/render_speedtest.1 | 2 +- docs/man/renderd.1 | 2 +- docs/man/renderd.conf.5 | 6 +++--- etc/apache2/renderd-example-map.conf | 2 +- utils/openstreetmap-tiles-update-rerender | 2 +- 33 files changed, 110 insertions(+), 45 deletions(-) diff --git a/.github/actions/cmake/build/action.yml b/.github/actions/cmake/build/action.yml index b51ff402..ff1e5b28 100644 --- a/.github/actions/cmake/build/action.yml +++ b/.github/actions/cmake/build/action.yml @@ -7,7 +7,10 @@ runs: cmake -B build -S . \ -LA \ -DCMAKE_BUILD_TYPE:STRING=${BUILD_TYPE:-Release} \ - -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX:-/usr/local} \ + -DCMAKE_INSTALL_LOCALSTATEDIR=${INSTALL_LOCALSTATEDIR:-/var} \ + -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX:-/usr} \ + -DCMAKE_INSTALL_RUNSTATEDIR=${INSTALL_RUNSTATEDIR:-/run} \ + -DCMAKE_INSTALL_SYSCONFDIR=${INSTALL_SYSCONFDIR:-/etc} \ -DENABLE_TESTS:BOOL=ON shell: bash --noprofile --norc -euxo pipefail {0} diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 910dff34..6f546b0d 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -143,6 +143,8 @@ jobs: env: CFLAGS: --coverage CXXFLAGS: --coverage + INSTALL_PREFIX: /usr/local + INSTALL_RUNSTATEDIR: /var/run LDFLAGS: -undefined dynamic_lookup TEST_PARALLEL_LEVEL: 1 name: >- @@ -211,6 +213,7 @@ jobs: CTEST_CLIENT_HOST: ::1 CTEST_SERVER_HOST: localhost CXXFLAGS: --coverage + INSTALL_PREFIX: /usr/local LIBRARY_PATH: /usr/local/lib TMPDIR: /tmp name: >- diff --git a/.github/workflows/install-package-and-test.yml b/.github/workflows/install-package-and-test.yml index 1607be13..241462af 100644 --- a/.github/workflows/install-package-and-test.yml +++ b/.github/workflows/install-package-and-test.yml @@ -65,7 +65,7 @@ jobs: URI=/tiles/renderd-example-webp XML=/usr/share/renderd/example-map/mapnik.xml ' | tee -a /etc/renderd.conf - mkdir -p /var/run/renderd + mkdir -p /run/renderd renderd a2enmod tile a2ensite renderd-example-map diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a2047aa..d28e93f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") project(mod_tile DESCRIPTION "Renders map tiles with Mapnik and serves them using Apache HTTP Server" HOMEPAGE_URL "https://github.com/openstreetmap/mod_tile" - VERSION 0.7.0 + VERSION 0.7.1 ) set(CMAKE_C_STANDARD 99) diff --git a/README.rst b/README.rst index 1fe71f7f..440564c4 100644 --- a/README.rst +++ b/README.rst @@ -129,11 +129,11 @@ Add map configurations for example-map to ``/etc/renderd.conf``: XML=/usr/share/renderd/example-map/mapnik.xml ' | sudo tee -a /etc/renderd.conf -Ensure the ``/var/run/renderd`` directory exists: +Ensure the ``/run/renderd`` directory exists: :: - $ sudo mkdir -p /var/run/renderd + $ sudo mkdir -p /run/renderd Start the rendering daemon: diff --git a/configure.ac b/configure.ac index 7d536c42..e8e4345e 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. # Define mod_tile version number -m4_define([mod_tile_version], [0.7.0]) +m4_define([mod_tile_version], [0.7.1]) AC_PREREQ([2.61]) AX_CONFIG_NICE diff --git a/docker/archlinux/Dockerfile b/docker/archlinux/Dockerfile index 087470c6..74844cd0 100644 --- a/docker/archlinux/Dockerfile +++ b/docker/archlinux/Dockerfile @@ -32,14 +32,16 @@ WORKDIR /tmp/mod_tile_build RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \ cmake -B . -S /tmp/mod_tile_src \ -DCMAKE_BUILD_TYPE:STRING=Release \ + -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_RUNSTATEDIR=/run \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ -DENABLE_TESTS:BOOL=ON && \ cmake --build . RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \ export DESTDIR=/tmp/mod_tile && \ ctest --output-on-failure && \ - (cmake --install . --prefix /usr --strip || make DESTDIR=${DESTDIR} install/strip) && \ - mv /tmp/mod_tile/var/run /tmp/mod_tile/run - + (cmake --install . --strip || make DESTDIR=${DESTDIR} install/strip) # Runner FROM archlinux:latest as runner diff --git a/docker/centos/7/Dockerfile b/docker/centos/7/Dockerfile index b4a69fa3..5f33d681 100644 --- a/docker/centos/7/Dockerfile +++ b/docker/centos/7/Dockerfile @@ -117,13 +117,16 @@ RUN source /opt/rh/devtoolset-9/enable && \ export CXXFLAGS="-I/usr/include/boost169" && \ cmake3 -B . -S /tmp/mod_tile_src \ -DCMAKE_BUILD_TYPE:STRING=Release \ + -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_RUNSTATEDIR=/run \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ -DENABLE_TESTS:BOOL=ON && \ cmake3 --build . RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \ export DESTDIR=/tmp/mod_tile && \ ctest3 --output-on-failure && \ - (cmake3 --install . --prefix /usr --strip || make DESTDIR=${DESTDIR} install/strip) && \ - mv /tmp/mod_tile/var/run /tmp/mod_tile/run + (cmake3 --install . --strip || make DESTDIR=${DESTDIR} install/strip) # Runner FROM centos:centos7 as runner diff --git a/docker/centos/stream/Dockerfile b/docker/centos/stream/Dockerfile index 717f3f07..86a84f16 100644 --- a/docker/centos/stream/Dockerfile +++ b/docker/centos/stream/Dockerfile @@ -132,13 +132,16 @@ WORKDIR /tmp/mod_tile_build RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \ cmake -B . -S /tmp/mod_tile_src \ -DCMAKE_BUILD_TYPE:STRING=Release \ + -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_RUNSTATEDIR=/run \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ -DENABLE_TESTS:BOOL=ON && \ cmake --build . RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \ export DESTDIR=/tmp/mod_tile && \ ctest --output-on-failure && \ - (cmake --install . --prefix /usr --strip || make DESTDIR=${DESTDIR} install/strip) && \ - mv /tmp/mod_tile/var/run /tmp/mod_tile/run + (cmake --install . --strip || make DESTDIR=${DESTDIR} install/strip) # Runner FROM quay.io/centos/centos:stream${centos_stream_version} as runner diff --git a/docker/centos/stream/Dockerfile.mapnik-latest b/docker/centos/stream/Dockerfile.mapnik-latest index 30a3b265..a5c71273 100644 --- a/docker/centos/stream/Dockerfile.mapnik-latest +++ b/docker/centos/stream/Dockerfile.mapnik-latest @@ -117,13 +117,16 @@ RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \ cmake -B . -S /tmp/mod_tile_src \ -DCMAKE_BUILD_TYPE:STRING=Release \ -DCMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES:PATH=/usr/include/boost1.78 \ + -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_RUNSTATEDIR=/run \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ -DENABLE_TESTS:BOOL=ON && \ cmake --build . RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \ export DESTDIR=/tmp/mod_tile && \ ctest --output-on-failure && \ - (cmake --install . --prefix /usr --strip || make DESTDIR=${DESTDIR} install/strip) && \ - mv /tmp/mod_tile/var/run /tmp/mod_tile/run + (cmake --install . --strip || make DESTDIR=${DESTDIR} install/strip) # Runner FROM quay.io/centos/centos:stream${centos_stream_version} as runner diff --git a/docker/debian/Dockerfile b/docker/debian/Dockerfile index 3351a621..a435f866 100644 --- a/docker/debian/Dockerfile +++ b/docker/debian/Dockerfile @@ -36,13 +36,16 @@ WORKDIR /tmp/mod_tile_build RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \ cmake -B . -S /tmp/mod_tile_src \ -DCMAKE_BUILD_TYPE:STRING=Release \ + -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_RUNSTATEDIR=/run \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ -DENABLE_TESTS:BOOL=ON && \ cmake --build . RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \ export DESTDIR=/tmp/mod_tile && \ ctest --output-on-failure && \ - (cmake --install . --prefix /usr --strip || make DESTDIR=${DESTDIR} install/strip) && \ - mv /tmp/mod_tile/var/run /tmp/mod_tile/run + (cmake --install . --strip || make DESTDIR=${DESTDIR} install/strip) # Runner FROM debian:${debian_version} as runner diff --git a/docker/fedora/Dockerfile b/docker/fedora/Dockerfile index 49ad83bb..ef34b200 100644 --- a/docker/fedora/Dockerfile +++ b/docker/fedora/Dockerfile @@ -31,13 +31,16 @@ WORKDIR /tmp/mod_tile_build RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \ cmake -B . -S /tmp/mod_tile_src \ -DCMAKE_BUILD_TYPE:STRING=Release \ + -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_RUNSTATEDIR=/run \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ -DENABLE_TESTS:BOOL=ON && \ cmake --build . RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \ export DESTDIR=/tmp/mod_tile && \ ctest --output-on-failure && \ - (cmake --install . --prefix /usr --strip || make DESTDIR=${DESTDIR} install/strip) && \ - mv /tmp/mod_tile/var/run /tmp/mod_tile/run + (cmake --install . --strip || make DESTDIR=${DESTDIR} install/strip) # Runner FROM fedora:${fedora_version} as runner diff --git a/docker/opensuse/Dockerfile b/docker/opensuse/Dockerfile index 7b777155..ffa18eff 100644 --- a/docker/opensuse/Dockerfile +++ b/docker/opensuse/Dockerfile @@ -113,13 +113,16 @@ WORKDIR /tmp/mod_tile_build RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \ cmake -B . -S /tmp/mod_tile_src \ -DCMAKE_BUILD_TYPE:STRING=Release \ + -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_RUNSTATEDIR=/run \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ -DENABLE_TESTS:BOOL=ON && \ cmake --build . RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \ export DESTDIR=/tmp/mod_tile && \ ctest --output-on-failure && \ - (cmake --install . --prefix /usr --strip || make DESTDIR=${DESTDIR} install/strip) && \ - mv /tmp/mod_tile/var/run /tmp/mod_tile/run + (cmake --install . --strip || make DESTDIR=${DESTDIR} install/strip) # Runner FROM opensuse/${opensuse_version} as runner diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile index 1a30df1e..c45590cd 100644 --- a/docker/ubuntu/Dockerfile +++ b/docker/ubuntu/Dockerfile @@ -37,13 +37,16 @@ WORKDIR /tmp/mod_tile_build RUN export CMAKE_BUILD_PARALLEL_LEVEL=$(nproc) && \ cmake -B . -S /tmp/mod_tile_src \ -DCMAKE_BUILD_TYPE:STRING=Release \ + -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_RUNSTATEDIR=/run \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ -DENABLE_TESTS:BOOL=ON && \ cmake --build . RUN export CTEST_PARALLEL_LEVEL=$(nproc) && \ export DESTDIR=/tmp/mod_tile && \ ctest --output-on-failure && \ - (cmake --install . --prefix /usr --strip || make DESTDIR=${DESTDIR} install/strip) && \ - mv /tmp/mod_tile/var/run /tmp/mod_tile/run + (cmake --install . --strip || make DESTDIR=${DESTDIR} install/strip) # Runner FROM ubuntu:${ubuntu_version} as runner diff --git a/docs/build/building_on_arch_linux.md b/docs/build/building_on_arch_linux.md index ba656b21..1c9745de 100644 --- a/docs/build/building_on_arch_linux.md +++ b/docs/build/building_on_arch_linux.md @@ -41,10 +41,14 @@ git clone --depth 1 https://github.com/openstreetmap/mod_tile.git . cd /tmp/mod_tile_build cmake -B . -S /tmp/mod_tile_src \ -DCMAKE_BUILD_TYPE:STRING=Release \ + -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_RUNSTATEDIR=/run \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ -DENABLE_TESTS:BOOL=ON cmake --build . ctest -sudo cmake --install . --prefix /usr --strip +sudo cmake --install . --strip # Create /usr/share/renderd directory sudo mkdir --parents /usr/share/renderd diff --git a/docs/build/building_on_centos.md b/docs/build/building_on_centos.md index 0dbea112..476f0d73 100644 --- a/docs/build/building_on_centos.md +++ b/docs/build/building_on_centos.md @@ -55,10 +55,14 @@ git clone --depth 1 https://github.com/openstreetmap/mod_tile.git . cd /tmp/mod_tile_build cmake3 -B . -S /tmp/mod_tile_src \ -DCMAKE_BUILD_TYPE:STRING=Release \ + -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_RUNSTATEDIR=/run \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ -DENABLE_TESTS:BOOL=ON cmake3 --build . ctest3 -sudo cmake --install . --prefix /usr --strip +sudo cmake --install . --strip # Create /usr/share/renderd directory sudo mkdir --parents /usr/share/renderd diff --git a/docs/build/building_on_centos_stream.md b/docs/build/building_on_centos_stream.md index 0f7220f6..b768603e 100644 --- a/docs/build/building_on_centos_stream.md +++ b/docs/build/building_on_centos_stream.md @@ -74,10 +74,14 @@ git clone --depth 1 https://github.com/openstreetmap/mod_tile.git . cd /tmp/mod_tile_build cmake -B . -S /tmp/mod_tile_src \ -DCMAKE_BUILD_TYPE:STRING=Release \ + -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_RUNSTATEDIR=/run \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ -DENABLE_TESTS:BOOL=ON cmake --build . ctest -sudo cmake --install . --prefix /usr --strip +sudo cmake --install . --strip # Create /usr/share/renderd directory sudo mkdir --parents /usr/share/renderd diff --git a/docs/build/building_on_debian.md b/docs/build/building_on_debian.md index 066ad4ec..c8ad7cac 100644 --- a/docs/build/building_on_debian.md +++ b/docs/build/building_on_debian.md @@ -42,10 +42,14 @@ git clone --depth 1 https://github.com/openstreetmap/mod_tile.git . cd /tmp/mod_tile_build cmake -B . -S /tmp/mod_tile_src \ -DCMAKE_BUILD_TYPE:STRING=Release \ + -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_RUNSTATEDIR=/run \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ -DENABLE_TESTS:BOOL=ON cmake --build . ctest -sudo cmake --install . --prefix /usr --strip +sudo cmake --install . --strip # Create /usr/share/renderd directory sudo mkdir --parents /usr/share/renderd diff --git a/docs/build/building_on_fedora.md b/docs/build/building_on_fedora.md index 5e16c460..f40ef915 100644 --- a/docs/build/building_on_fedora.md +++ b/docs/build/building_on_fedora.md @@ -39,10 +39,14 @@ git clone --depth 1 https://github.com/openstreetmap/mod_tile.git . cd /tmp/mod_tile_build cmake -B . -S /tmp/mod_tile_src \ -DCMAKE_BUILD_TYPE:STRING=Release \ + -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_RUNSTATEDIR=/run \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ -DENABLE_TESTS:BOOL=ON cmake --build . ctest -sudo cmake --install . --prefix /usr --strip +sudo cmake --install . --strip # Create /usr/share/renderd directory sudo mkdir --parents /usr/share/renderd diff --git a/docs/build/building_on_freebsd.md b/docs/build/building_on_freebsd.md index 1e61a410..863237ca 100644 --- a/docs/build/building_on_freebsd.md +++ b/docs/build/building_on_freebsd.md @@ -44,10 +44,14 @@ git clone --depth 1 https://github.com/openstreetmap/mod_tile.git . cd /tmp/mod_tile_build cmake -B . -S /tmp/mod_tile_src \ -DCMAKE_BUILD_TYPE:STRING=Release \ + -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ + -DCMAKE_INSTALL_PREFIX=/usr/local \ + -DCMAKE_INSTALL_RUNSTATEDIR=/run \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ -DENABLE_TESTS:BOOL=ON cmake --build . ctest -sudo cmake --install . --prefix /usr --strip +sudo cmake --install . --strip # Create /usr/share/renderd directory sudo mkdir -p /usr/share/renderd diff --git a/docs/build/building_on_macos.md b/docs/build/building_on_macos.md index 54caaac4..c013ac07 100644 --- a/docs/build/building_on_macos.md +++ b/docs/build/building_on_macos.md @@ -40,10 +40,14 @@ git clone --depth 1 https://github.com/openstreetmap/mod_tile.git . cd /tmp/mod_tile_build cmake -B . -S /tmp/mod_tile_src \ -DCMAKE_BUILD_TYPE:STRING=Release \ + -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ + -DCMAKE_INSTALL_PREFIX=/usr/local \ + -DCMAKE_INSTALL_RUNSTATEDIR=/var/run \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ -DENABLE_TESTS:BOOL=ON cmake --build . ctest -sudo cmake --install . --prefix /usr/local --strip +sudo cmake --install . --strip # Create /usr/local/share/renderd directory sudo mkdir -p /usr/local/share/renderd diff --git a/docs/build/building_on_opensuse.md b/docs/build/building_on_opensuse.md index 556f9a7a..682fc96b 100644 --- a/docs/build/building_on_opensuse.md +++ b/docs/build/building_on_opensuse.md @@ -58,10 +58,14 @@ git clone --depth 1 https://github.com/openstreetmap/mod_tile.git . cd /tmp/mod_tile_build cmake -B . -S /tmp/mod_tile_src \ -DCMAKE_BUILD_TYPE:STRING=Release \ + -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_RUNSTATEDIR=/run \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ -DENABLE_TESTS:BOOL=ON cmake --build . ctest -sudo cmake --install . --prefix /usr --strip +sudo cmake --install . --strip # Create /usr/share/renderd directory sudo mkdir --parents /usr/share/renderd diff --git a/docs/build/building_on_ubuntu.md b/docs/build/building_on_ubuntu.md index fa81716c..35144a0a 100644 --- a/docs/build/building_on_ubuntu.md +++ b/docs/build/building_on_ubuntu.md @@ -42,10 +42,14 @@ git clone --depth 1 https://github.com/openstreetmap/mod_tile.git . cd /tmp/mod_tile_build cmake -B . -S /tmp/mod_tile_src \ -DCMAKE_BUILD_TYPE:STRING=Release \ + -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_RUNSTATEDIR=/run \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ -DENABLE_TESTS:BOOL=ON cmake --build . ctest -sudo cmake --install . --prefix /usr --strip +sudo cmake --install . --strip # Create /usr/share/renderd directory sudo mkdir --parents /usr/share/renderd diff --git a/docs/man/convert_meta.1 b/docs/man/convert_meta.1 index 4696c0a2..c70aca0e 100644 --- a/docs/man/convert_meta.1 +++ b/docs/man/convert_meta.1 @@ -1,4 +1,4 @@ -.TH CONVERT_META "1" "2023-12-19" "mod_tile v0.7.0" +.TH CONVERT_META "1" "2024-03-16" "mod_tile v0.7.1" .\" Please adjust this date whenever revising the manpage. .SH NAME diff --git a/docs/man/openstreetmap-tiles-update-expire.1 b/docs/man/openstreetmap-tiles-update-expire.1 index bba4e72b..fd7f2ffd 100644 --- a/docs/man/openstreetmap-tiles-update-expire.1 +++ b/docs/man/openstreetmap-tiles-update-expire.1 @@ -1,4 +1,4 @@ -.TH TILES-UPDATE-EXPIRE "1" "2023-12-19" "mod_tile v0.7.0" +.TH TILES-UPDATE-EXPIRE "1" "2024-03-16" "mod_tile v0.7.1" .\" Please adjust this date whenever revising the manpage. .SH NAME diff --git a/docs/man/render_expired.1 b/docs/man/render_expired.1 index 2dd3162a..fdc427d1 100644 --- a/docs/man/render_expired.1 +++ b/docs/man/render_expired.1 @@ -1,4 +1,4 @@ -.TH RENDER_EXPIRED "1" "2024-03-08" "mod_tile v0.7.0" +.TH RENDER_EXPIRED "1" "2024-03-16" "mod_tile v0.7.1" .\" Please adjust this date whenever revising the manpage. .SH NAME diff --git a/docs/man/render_list.1 b/docs/man/render_list.1 index ccf9c77e..a1831ea3 100644 --- a/docs/man/render_list.1 +++ b/docs/man/render_list.1 @@ -1,4 +1,4 @@ -.TH RENDER_LIST "1" "2024-03-08" "mod_tile v0.7.0" +.TH RENDER_LIST "1" "2024-03-16" "mod_tile v0.7.1" .\" Please adjust this date whenever revising the manpage. .SH NAME @@ -51,7 +51,7 @@ Render tiles in this map (default is 'default'). Sleep if load is this high (default is '16'). .TP \fB\-s\fR|\-\-socket=SOCKET|HOSTNAME:PORT -Unix domain socket name or hostname and port for contacting renderd (default is '/var/run/renderd/renderd.sock'). +Unix domain socket name or hostname and port for contacting renderd (default is '/run/renderd/renderd.sock'). .TP \fB\-n\fR|\-\-num-threads=N The number of parallel request threads (default is '1'). diff --git a/docs/man/render_old.1 b/docs/man/render_old.1 index 6d346799..a190e305 100644 --- a/docs/man/render_old.1 +++ b/docs/man/render_old.1 @@ -1,4 +1,4 @@ -.TH RENDER_OLD "1" "2023-12-19" "mod_tile v0.7.0" +.TH RENDER_OLD "1" "2024-03-16" "mod_tile v0.7.1" .\" Please adjust this date whenever revising the manpage. .SH NAME diff --git a/docs/man/render_speedtest.1 b/docs/man/render_speedtest.1 index cafd6f50..38b8cbc2 100644 --- a/docs/man/render_speedtest.1 +++ b/docs/man/render_speedtest.1 @@ -1,4 +1,4 @@ -.TH RENDER_SPEEDTEST "1" "2023-12-19" "mod_tile v0.7.0" +.TH RENDER_SPEEDTEST "1" "2024-03-16" "mod_tile v0.7.1" .\" Please adjust this date whenever revising the manpage. .SH NAME diff --git a/docs/man/renderd.1 b/docs/man/renderd.1 index c57e6b3b..9ebd3f81 100644 --- a/docs/man/renderd.1 +++ b/docs/man/renderd.1 @@ -1,4 +1,4 @@ -.TH RENDERD "1" "2023-12-19" "mod_tile v0.7.0" +.TH RENDERD "1" "2024-03-16" "mod_tile v0.7.1" .\" Please adjust this date whenever revising the manpage. .SH NAME diff --git a/docs/man/renderd.conf.5 b/docs/man/renderd.conf.5 index c3bdaf26..346ee545 100644 --- a/docs/man/renderd.conf.5 +++ b/docs/man/renderd.conf.5 @@ -1,4 +1,4 @@ -.TH RENDERD.CONF 5 "2024-01-22" "mod_tile v0.7.0" +.TH RENDERD.CONF 5 "2024-03-16" "mod_tile v0.7.1" .\" Please adjust this date whenever revising the manpage. .SH NAME @@ -48,13 +48,13 @@ The default value is \fB'4'\fR (macro definition \fB'NUM_THREADS'\fR). .B pid_file Specify the file path into which the PID will be written by \fBrenderd\fR. It is only written to when \fBrenderd\fR is not running in \fBforeground\fR mode (e.g. without \fB'--foreground'\fR / \fB'-f')\fR. -The default value is \fB'/var/run/renderd/renderd.pid'\fR (macro definition \fB'RENDERD_PIDFILE'\fR). +The default value is \fB'/run/renderd/renderd.pid'\fR (macro definition \fB'RENDERD_PIDFILE'\fR). .TP .B socketname Specify the file path to be used as a unix domain socket for communication with \fBrenderd\fR. This option and \fBiphostname\fR / \fBipport\fR are mutually exclusive. -The default value is \fB'/var/run/renderd/renderd.sock'\fR (macro definition \fB'RENDERD_SOCKET'\fR). +The default value is \fB'/run/renderd/renderd.sock'\fR (macro definition \fB'RENDERD_SOCKET'\fR). .TP .B stats_file diff --git a/etc/apache2/renderd-example-map.conf b/etc/apache2/renderd-example-map.conf index 1a040f9d..f30b627a 100644 --- a/etc/apache2/renderd-example-map.conf +++ b/etc/apache2/renderd-example-map.conf @@ -66,7 +66,7 @@ Listen 8081 ModTileMaxLoadMissing 5 # Socket where we connect to the rendering daemon - ModTileRenderdSocketName /var/run/renderd/renderd.sock + ModTileRenderdSocketName /run/renderd/renderd.sock # Options controlling the cache proxy expiry headers. All values are in seconds. # diff --git a/utils/openstreetmap-tiles-update-rerender b/utils/openstreetmap-tiles-update-rerender index dba8ed83..c5cc59c4 100755 --- a/utils/openstreetmap-tiles-update-rerender +++ b/utils/openstreetmap-tiles-update-rerender @@ -192,7 +192,7 @@ else # # Note no --touch-from=$EXPIRY_TOUCHFROM #------------------------------------------------------------------------------ - if ! render_expired --map=ajt --min-zoom=$EXPIRY_MINZOOM --delete-from=$EXPIRY_DELETEFROM --max-zoom=$EXPIRY_MAXZOOM -s /var/run/renderd/renderd.sock <"$EXPIRY_FILE.$$" 2>&1 | tail -8 >>"$EXPIRYLOG"; then + if ! render_expired --map=ajt --min-zoom=$EXPIRY_MINZOOM --delete-from=$EXPIRY_DELETEFROM --max-zoom=$EXPIRY_MAXZOOM -s /run/renderd/renderd.sock <"$EXPIRY_FILE.$$" 2>&1 | tail -8 >>"$EXPIRYLOG"; then m_info "Expiry failed" fi