Minor tweaks to control flow and default gwc settings (#690)

kartoza · Sep 26, 2024 · 31cebac · 31cebac
1 parent 704f560
commit 31cebac
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/build_data/controlflow.properties b/build_data/controlflow.properties
@@ -4,4 +4,7 @@ ows.wms.getmap=${GETMAP}
 ows.wfs.getfeature.application/msexcel=${REQUEST_EXCEL}
 user=${SINGLE_USER}
 ows.gwc=${GWC_REQUEST}
-user.ows.wps.execute=${WPS_REQUEST}
+user.ows.wps.execute=${WPS_REQUEST}
+user.ows.wms.getmap=${USER_WMS_REQUEST}
+ip=${THROTTLE_REQUEST_PER_IP}
+#ip.blacklist=<ip_addr1>,<ip_addr2>,...
diff --git a/build_data/gwc-gs.xml b/build_data/gwc-gs.xml
@@ -25,7 +25,9 @@
   <metaTilingY>4</metaTilingY>
   <gutter>0</gutter>
   <defaultCachingGridSetIds>
+    <string>WebMercatorQuad</string>
     <string>EPSG:4326</string>
+    <string>WebMercatorQuadx2</string>
     <string>EPSG:900913</string>
   </defaultCachingGridSetIds>
   <defaultCoverageCacheFormats>

diff --git a/scripts/env-data.sh b/scripts/env-data.sh
@@ -240,6 +240,14 @@ if [ -z "${WPS_REQUEST}" ]; then
     WPS_REQUEST='1000/d;30s'
 fi
 
+if [ -z "${USER_WMS_REQUEST}" ]; then
+    USER_WMS_REQUEST='30/s'
+fi
+
+if [ -z "${THROTTLE_REQUEST_PER_IP}" ]; then
+    THROTTLE_REQUEST_PER_IP=10
+fi
+
 file_env S3_SERVER_URL
 if [ -z "${S3_SERVER_URL}" ]; then
     S3_SERVER_URL=''

diff --git a/scripts/start.sh b/scripts/start.sh
@@ -292,7 +292,7 @@ if [[ ${CLUSTERING} =~ [Tt][Rr][Uu][Ee] ]]; then
 
 fi
 
-export REQUEST_TIMEOUT PARALLEL_REQUEST GETMAP REQUEST_EXCEL SINGLE_USER GWC_REQUEST WPS_REQUEST
+export REQUEST_TIMEOUT PARALLEL_REQUEST GETMAP REQUEST_EXCEL SINGLE_USER GWC_REQUEST WPS_REQUEST USER_WMS_REQUEST THROTTLE_REQUEST_PER_IP
 # Setup control flow properties
 setup_control_flow