diff options
| author | Alessio Caiazza <acaiazza@gitlab.com> | 2023-11-28 16:35:27 +0300 |
|---|---|---|
| committer | Alessio Caiazza <acaiazza@gitlab.com> | 2023-11-28 16:35:27 +0300 |
| commit | 121f1e96d05346988e88349597ee4992dfdd9b15 (patch) | |
| tree | be015457e45fb14e7cf78fcad31b646800f0446a /internal/config/config.go | |
| parent | 93d2dc70ccac3920439712fba3afde55f05777fa (diff) | |
| parent | 7e9d46766d1926f93bb4a0d6f00d03d122316ad6 (diff) | |
Merge branch 'naman/17584-pages-namespace-in-path' into 'master'
Add path in session cookie when namespace is provided in path
See merge request https://gitlab.com/gitlab-org/gitlab-pages/-/merge_requests/929
Merged-by: Alessio Caiazza <acaiazza@gitlab.com>
Approved-by: Alessio Caiazza <acaiazza@gitlab.com>
Co-authored-by: ngala <ngala@gitlab.com>
Diffstat (limited to 'internal/config/config.go')
| -rw-r--r-- | internal/config/config.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/internal/config/config.go b/internal/config/config.go index d2016550..ba227016 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -61,6 +61,8 @@ type General struct { ShowVersion bool CustomHeaders http.Header + + NamespaceInPath bool } // RateLimit config struct @@ -317,6 +319,7 @@ func loadConfig() (*Config, error) { InsecureCiphers: *insecureCiphers, PropagateCorrelationID: *propagateCorrelationID, ShowVersion: *showVersion, + NamespaceInPath: *namespaceInPath, }, RateLimit: RateLimit{ SourceIPLimitPerSecond: *rateLimitSourceIP, @@ -518,6 +521,7 @@ func logFields(config *Config) map[string]any { "sentry-dsn": config.Sentry.DSN, "sentry-environment": config.Sentry.Environment, "version": config.General.ShowVersion, + "namespace-in-path": *namespaceInPath, } } |