Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
geomag-algorithms
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
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
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
ghsc
National Geomagnetism Program
geomag-algorithms
Commits
1059f5c6
Commit
1059f5c6
authored
4 years ago
by
Jeremy M Fee
Browse files
Options
Downloads
Patches
Plain Diff
Update proxy_redirect, revert service map for additional urls
parent
0f6ca746
No related branches found
No related tags found
1 merge request
!146
Release CMO metadata to production
Pipeline
#25922
passed with warnings
4 years ago
Stage: test
Stage: integration
Stage: scan
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
scripts/custom.config.sh
+1
-5
1 addition, 5 deletions
scripts/custom.config.sh
scripts/custom.funcs.sh
+2
-2
2 additions, 2 deletions
scripts/custom.funcs.sh
with
3 additions
and
7 deletions
scripts/custom.config.sh
+
1
−
5
View file @
1059f5c6
...
@@ -2,11 +2,7 @@
...
@@ -2,11 +2,7 @@
export
SITE_URL
=
"
${
SITE_URL_PREFIX
}
geomag
${
SITE_URL_SUFFIX
}
"
;
export
SITE_URL
=
"
${
SITE_URL_PREFIX
}
geomag
${
SITE_URL_SUFFIX
}
"
;
export
BASE_HREF
=
${
BASE_HREF
:-
ws
}
;
export
BASE_HREF
=
${
BASE_HREF
:-
ws
}
;
export
SERVICE_MAP
=(
export
SERVICE_MAP
=(
"/ws/docs:web"
"/
${
BASE_HREF
}
:web"
"/ws/data:web"
"/ws/elements:web"
"/ws/metadata:web"
"/ws/observatories:web"
)
;
)
;
# Algorithms Environment Variables
# Algorithms Environment Variables
export
DATA_HOST
=
${
DATA_HOST
:-
cwbpub
.cr.usgs.gov
}
;
export
DATA_HOST
=
${
DATA_HOST
:-
cwbpub
.cr.usgs.gov
}
;
...
...
This diff is collapsed.
Click to expand it.
scripts/custom.funcs.sh
+
2
−
2
View file @
1059f5c6
...
@@ -52,8 +52,8 @@ updateRouting () {
...
@@ -52,8 +52,8 @@ updateRouting () {
proxy_set_header X-Client-IP
\$
remote_addr;
proxy_set_header X-Client-IP
\$
remote_addr;
proxy_set_header X-Forwarded-For
\$
proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-For
\$
proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto https;
proxy_set_header X-Forwarded-Proto https;
#
clean up any redirects sent by proxy
#
keep redirects on https
proxy_redirect http://
\$
proxy_host
${
path
}
https://
\$
host
${
path
}
;
proxy_redirect http://
\$
host:
\$
port
https://
\$
host;
}
}
EO_SERVER_SNIP
EO_SERVER_SNIP
# ^^ Note: TAB indentation required
# ^^ Note: TAB indentation required
...
...
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