Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
geosphere-mapserver
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cspp_geo
geosphere
geosphere-mapserver
Commits
7939c8dd
Verified
Commit
7939c8dd
authored
4 years ago
by
David Hoese
Browse files
Options
Downloads
Patches
Plain Diff
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
4 years ago
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
chart/geosphere-mapserver/templates/deployment.yaml
+2
-0
2 additions, 0 deletions
chart/geosphere-mapserver/templates/deployment.yaml
mapserver/run.sh
+1
-0
1 addition, 0 deletions
mapserver/run.sh
mapserver/site-conf
+2
-1
2 additions, 1 deletion
mapserver/site-conf
with
5 additions
and
1 deletion
chart/geosphere-mapserver/templates/deployment.yaml
+
2
−
0
View file @
7939c8dd
...
...
@@ -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"
...
...
This diff is collapsed.
Click to expand it.
mapserver/run.sh
+
1
−
0
View file @
7939c8dd
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
mapserver/site-conf
+
2
−
1
View file @
7939c8dd
...
...
@@ -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]
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment