Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrasimir Angelov <kangelov@gitlab.com>2019-10-31 03:51:24 +0300
committerKrasimir Angelov <kangelov@gitlab.com>2019-11-06 02:44:48 +0300
commite4daad77c9124e616002b2fb2ea3d96094132761 (patch)
tree39c4458de8f8ef2d765aefc70bbcab4b8178039a /main.go
parent566f49ea74c88a50e4a4b572f37af3184a33499d (diff)
Add minimal support for the api-secret-key config flag
Related to https://gitlab.com/gitlab-org/gitlab/issues/28781 and https://gitlab.com/gitlab-org/gitlab-pages/issues/253.
Diffstat (limited to 'main.go')
-rw-r--r--main.go6
1 files changed, 6 insertions, 0 deletions
diff --git a/main.go b/main.go
index 973c35cd..f31de528 100644
--- a/main.go
+++ b/main.go
@@ -57,6 +57,7 @@ var (
secret = flag.String("auth-secret", "", "Cookie store hash key, should be at least 32 bytes long.")
gitLabAuthServer = flag.String("auth-server", "", "DEPRECATED, use gitlab-server instead. GitLab server, for example https://www.gitlab.com")
gitLabServer = flag.String("gitlab-server", "", "GitLab server, for example https://www.gitlab.com")
+ gitLabAPISecretKey = flag.String("api-secret-key", "", "File with secret key used to authenticate with the GitLab API (NOT YET IMPLEMENTED)")
clientID = flag.String("auth-client-id", "", "GitLab application Client ID")
clientSecret = flag.String("auth-client-secret", "", "GitLab application Client Secret")
redirectURI = flag.String("auth-redirect-uri", "", "GitLab application redirect URI")
@@ -237,9 +238,14 @@ func loadConfig() appConfig {
"tls-max-version": *tlsMaxVersion,
"use-http-2": config.HTTP2,
"gitlab-server": config.GitLabServer,
+ "api-secret-key": *gitLabAPISecretKey,
"auth-redirect-uri": config.RedirectURI,
}).Debug("Start daemon with configuration")
+ if *gitLabAPISecretKey != "" {
+ log.Warn("api-secret-key parameter is a placeholder for future developments, this option will be ignored.")
+ }
+
return config
}