Skip to content

Commit 31cebac

Browse files
authored
Minor tweaks to control flow and default gwc settings (#690)
1 parent 704f560 commit 31cebac

File tree

4 files changed

+15
-2
lines changed

4 files changed

+15
-2
lines changed

build_data/controlflow.properties

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@ ows.wms.getmap=${GETMAP}
44
ows.wfs.getfeature.application/msexcel=${REQUEST_EXCEL}
55
user=${SINGLE_USER}
66
ows.gwc=${GWC_REQUEST}
7-
user.ows.wps.execute=${WPS_REQUEST}
7+
user.ows.wps.execute=${WPS_REQUEST}
8+
user.ows.wms.getmap=${USER_WMS_REQUEST}
9+
ip=${THROTTLE_REQUEST_PER_IP}
10+
#ip.blacklist=<ip_addr1>,<ip_addr2>,...

build_data/gwc-gs.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@
2525
<metaTilingY>4</metaTilingY>
2626
<gutter>0</gutter>
2727
<defaultCachingGridSetIds>
28+
<string>WebMercatorQuad</string>
2829
<string>EPSG:4326</string>
30+
<string>WebMercatorQuadx2</string>
2931
<string>EPSG:900913</string>
3032
</defaultCachingGridSetIds>
3133
<defaultCoverageCacheFormats>

scripts/env-data.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,14 @@ if [ -z "${WPS_REQUEST}" ]; then
240240
WPS_REQUEST='1000/d;30s'
241241
fi
242242

243+
if [ -z "${USER_WMS_REQUEST}" ]; then
244+
USER_WMS_REQUEST='30/s'
245+
fi
246+
247+
if [ -z "${THROTTLE_REQUEST_PER_IP}" ]; then
248+
THROTTLE_REQUEST_PER_IP=10
249+
fi
250+
243251
file_env S3_SERVER_URL
244252
if [ -z "${S3_SERVER_URL}" ]; then
245253
S3_SERVER_URL=''

scripts/start.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ if [[ ${CLUSTERING} =~ [Tt][Rr][Uu][Ee] ]]; then
292292

293293
fi
294294

295-
export REQUEST_TIMEOUT PARALLEL_REQUEST GETMAP REQUEST_EXCEL SINGLE_USER GWC_REQUEST WPS_REQUEST
295+
export REQUEST_TIMEOUT PARALLEL_REQUEST GETMAP REQUEST_EXCEL SINGLE_USER GWC_REQUEST WPS_REQUEST USER_WMS_REQUEST THROTTLE_REQUEST_PER_IP
296296
# Setup control flow properties
297297
setup_control_flow
298298

0 commit comments

Comments
 (0)