Skip to content
Snippets Groups Projects
Verified Commit 7939c8dd authored by David Hoese's avatar David Hoese
Browse files

Fix location of shapefiles in apache config

parent 38aff01b
No related branches found
No related tags found
No related merge requests found
Pipeline #12352 passed
......@@ -47,6 +47,8 @@ spec:
value: "{{ join " " .Values.platforms }}"
- name: WMS_SECTORS
value: "{{ join " " .Values.sectors }}"
- name: LAYER_BASE_DIR
value: "/dst/tiles"
volumeMounts:
- name: src
mountPath: "/data"
......
......@@ -8,6 +8,7 @@ mf_tmpl="/work/abi_l1b_template.map"
export WMS_PLATFORMS=${WMS_PLATFORMS:-"g16 g17"}
export WMS_SECTORS=${WMS_SECTORS:-"radm1 radm2 radc radf"}
python3 /work/render.py $mf_tmpl "/work/mapfiles/{platform}_abi_{sector}_l1b.map"
sed -i "s/__LAYER_BASE_DIR__/$LAYER_BASE_DIR/g" /etc/apache2/sites-available/cspp_geo.conf
/usr/sbin/apache2ctl configtest
......
......@@ -37,7 +37,8 @@
#RewriteRule "^/fwms/([^/]+)/([^/]+)/([^/]+)/([^/]+)?(.*)" "/cgi-bin/mapserv.fcgi?map=/work/mapfiles/$1_$2_$3_$4.map&$5" [PT,QSA]
#RewriteRule "^/fwms/([^/]+)?(.*)" "/cgi-bin/mapserv.fcgi?map=/work/mapfiles/$1.map&$2" [PT,QSA]
# /wms_times/g16/abi/radf/true_color
RewriteRule "^/wms_times/([^/]+)/([^/]+)/([^/]+)/([^/]+)" "/cgi-bin/layer_times.py?layer=/data/tiles/$1/$2/$3/$4/$4.shp" [PT,QSA]
# LAYER_BASE_DIR defaults to /data/tiles
RewriteRule "^/wms_times/([^/]+)/([^/]+)/([^/]+)/([^/]+)" "/cgi-bin/layer_times.py?layer=__LAYER_BASE_DIR__/$1/$2/$3/$4/$4.shp" [PT,QSA]
# Regular CGI version of the URL (put last since it should be used less often)
RewriteRule "^/wms_cgi/([^/]+)/([^/]+)/([^/]+)/([^/]+)?(.*)" "/cgi-bin/mapserv?map=/work/mapfiles/$1_$2_$3_$4.map&$5" [PT,QSA]
RewriteRule "^/wms_cgi/([^/]+)?(.*)" "/cgi-bin/mapserv?map=/work/mapfiles/$1.map&$2" [PT,QSA]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment