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
Merge requests
!379
refactor(conf): replace client conf file by env var
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
refactor(conf): replace client conf file by env var
536-replace-conf-file-by-env-var
into
dev
Overview
0
Commits
3
Pipelines
0
Changes
2
Merged
Etienne LOUPIAS
requested to merge
536-replace-conf-file-by-env-var
into
dev
11 months ago
Overview
0
Commits
3
Pipelines
0
Changes
2
Expand
Related to
https://forge.grandlyon.com/web-et-numerique/factory/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/-/issues/536
0
0
Merge request reports
Compare
dev
version 1
d4f512d3
11 months ago
dev (base)
and
latest version
latest version
a6e6df75
3 commits,
10 months ago
version 1
d4f512d3
1 commit,
11 months ago
2 files
+
16
−
1
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
Search (e.g. *.vue) (Ctrl+P)
src/app.controller.ts
+
12
−
0
Options
@@ -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
,
};
}
}
Loading