diff --git a/mapcache/Dockerfile b/mapcache/Dockerfile index 89e3ea6f9d93370ae554ddafc8b52ba87f26113c..e62e25777f5274e5cd8ad891e613591f39c0a0c0 100644 --- a/mapcache/Dockerfile +++ b/mapcache/Dockerfile @@ -57,7 +57,7 @@ RUN mkdir -p /build_deps && cd /build_deps \ && git checkout c467a3bb444cab69c52bc78b91b9bae3a9415f2f \ && mkdir -p build && cd build \ && cmake .. \ -# -DWITH_MEMCACHE=1 -DCMAKE_BUILD_TYPE="Debug" \ +# && cmake -DCMAKE_BUILD_TYPE="Debug" .. \ && make -j$(nproc) \ && make install diff --git a/mapcache/mapcache_template.xml b/mapcache/mapcache_template.xml index e73c0a8ec06c28214325021c404cb082b66bf141..a42c97b841678e29c692032de6f527cd11f10579 100644 --- a/mapcache/mapcache_template.xml +++ b/mapcache/mapcache_template.xml @@ -25,14 +25,6 @@ <cache name="disk" type="disk"> <base>{{ cache_disk_base }}</base> <symlink_blank/> - <!-- detect_blank - Similar to symlink_blank, except completely skip writing a file - if a blank, fully transparent tile is detected. - Note: This setting should only be used when using the seeder. If used - on demand, mapcache will will query the WMS source on each subsequent - tile request. - --> - <detect_blank/> </cache> @@ -339,7 +331,7 @@ <locker type="disk"> <!-- this is the default --> - <directory>/tmp</directory> + <directory>{{ lock_disk_base }}</directory> <retry>0.01</retry> <!-- check back every .01 seconds --> </locker> <threaded_fetching>true</threaded_fetching> diff --git a/mapcache/render.py b/mapcache/render.py index 4cb5b67f14c828a7ee5b8667f74940e237522753..06dc856769abaf1a5eaeeb71df5810a53a7f44d5 100644 --- a/mapcache/render.py +++ b/mapcache/render.py @@ -28,6 +28,7 @@ basemap_autoexpire = os.getenv("BASEMAP_AUTOEXPIRE", "0") wms_host = os.environ['WMS_HOST'] wms_port = os.environ['WMS_PORT'] cache_disk_base = os.environ['CACHE_DISK_BASE'] +lock_disk_base = os.getenv('LOCK_DISK_BASE', '/tmp') PLATFORM_LONG_NAMES = { @@ -66,6 +67,7 @@ def main(): 'wms_host': wms_host, 'wms_port': wms_port, 'cache_disk_base': cache_disk_base, + 'lock_disk_base': lock_disk_base, 'PLATFORM_LONG_NAMES': PLATFORM_LONG_NAMES, 'PLATFORM_EPSGS': PLATFORM_EPSGS, 'PLATFORM_POS_NAMES': PLATFORM_POS_NAMES, diff --git a/mapcache/site-conf b/mapcache/site-conf index da23cdb14241e88c8b90a179a4fba4c3ca8ab9b1..d0bfef625002890374c502b040899ae88280632e 100644 --- a/mapcache/site-conf +++ b/mapcache/site-conf @@ -16,6 +16,7 @@ # It is also possible to configure the loglevel for particular # modules, e.g. #LogLevel info ssl:warn + #LogLevel debug ErrorLog ${APACHE_LOG_DIR}/error.log CustomLog ${APACHE_LOG_DIR}/access.log combined