Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Server
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
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
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
web-et-numerique
Factory
Resin
Server
Commits
b06d62d1
Commit
b06d62d1
authored
9 months ago
by
Etienne LOUPIAS
Browse files
Options
Downloads
Patches
Plain Diff
refactor(conf): replace client conf file by env var
parent
04ccf0b7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!404
V3.1.0 (sans impression)
,
!379
refactor(conf): replace client conf file by env var
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.env.template
+4
-1
4 additions, 1 deletion
.env.template
src/app.controller.ts
+12
-0
12 additions, 0 deletions
src/app.controller.ts
with
16 additions
and
1 deletion
.env.template
+
4
−
1
View file @
b06d62d1
...
...
@@ -39,4 +39,7 @@ ELASTICSEARCH_PORT=<elastic search port>
ELASTICSEARCH_USERNAME=<elastic search username>
ELASTICSEARCH_PASSWORD=<elastic search password>
ELASTIC_SECURITY=<elastic search security boolean (true = secure)>
KIBANA_PORT=<kibana port>
\ No newline at end of file
KIBANA_PORT=<kibana port>
# Matomo
MATOMO_URL=<matomo url>
MATOMO_SITEID=<matomo site id>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/app.controller.ts
+
12
−
0
View file @
b06d62d1
...
...
@@ -13,4 +13,16 @@ export class AppController {
version
:
version
,
};
}
@
Get
(
'
config
'
)
async
config
()
{
// temp IS_OPENSHIFT: on appsoc servers, GHOST_HOST_AND_PORT is local network server name
return
{
ghostAdminUrl
:
((
process
.
env
.
IS_OPENSHIFT
?
process
.
env
.
GHOST_HOST_AND_PORT
:
process
.
env
.
GHOST_URL_APPSOC
)
||
'
http://localhost:2368
'
)
+
'
/ghost/
'
,
matomoTrackerUrl
:
process
.
env
.
MATOMO_URL
,
matomoSiteId
:
process
.
env
.
MATOMO_SITEID
,
};
}
}
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