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:
authorIgor Wiedler <iwiedler@gitlab.com>2020-04-30 18:41:24 +0300
committerIgor Wiedler <iwiedler@gitlab.com>2020-04-30 18:41:24 +0300
commit76dc097b972fb9415b37b04b44cb54ca91811cb6 (patch)
tree38bf92a3e222df8cdce274785ab3e754a7a801b2 /main.go
parent22cadaef88074326535e49fb0dc2d345619408da (diff)
change back to internal-gitlab-server as per @@vshushlin
Diffstat (limited to 'main.go')
-rw-r--r--main.go12
1 files changed, 6 insertions, 6 deletions
diff --git a/main.go b/main.go
index ec2bfe49..8ea87202 100644
--- a/main.go
+++ b/main.go
@@ -61,7 +61,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")
- gitLabAPIServer = flag.String("gitlab-api-server", "", "GitLab server used for API requests, for example https://www.gitlab.com, useful if you want to send that traffic over an internal load balancer (defaults to value of gitlab-server)")
+ internalGitLabServer = flag.String("internal-gitlab-server", "", "Internal GitLab server used for API requests, useful if you want to send that traffic over an internal load balancer, example value https://www.gitlab.com (defaults to value of gitlab-server)")
gitLabAPISecretKey = flag.String("api-secret-key", "", "File with secret key used to authenticate with the GitLab API")
gitlabClientHTTPTimeout = flag.Duration("gitlab-client-http-timeout", 10*time.Second, "GitLab API HTTP client connection timeout in seconds (default: 10s)")
gitlabClientJWTExpiry = flag.Duration("gitlab-client-jwt-expiry", 30*time.Second, "JWT Token expiry time in seconds (default: 30s)")
@@ -108,9 +108,9 @@ func gitlabServerFromFlags() string {
return host.FromString(url.Host)
}
-func gitlabAPIServerFromFlags() string {
- if *gitLabAPIServer != "" {
- return *gitLabAPIServer
+func InternalGitLabServerFromFlags() string {
+ if *internalGitLabServer != "" {
+ return *internalGitLabServer
}
return gitlabServerFromFlags()
@@ -190,7 +190,7 @@ func configFromFlags() appConfig {
}
config.GitLabServer = gitlabServerFromFlags()
- config.GitLabAPIServer = gitlabAPIServerFromFlags()
+ config.InternalGitLabServer = InternalGitLabServerFromFlags()
config.GitlabClientHTTPTimeout = *gitlabClientHTTPTimeout
config.GitlabJWTTokenExpiration = *gitlabClientJWTExpiry
config.StoreSecret = *secret
@@ -275,7 +275,7 @@ func loadConfig() appConfig {
"tls-max-version": *tlsMaxVersion,
"use-http-2": config.HTTP2,
"gitlab-server": config.GitLabServer,
- "gitlab-api-server": config.GitLabAPIServer,
+ "internal-gitlab-server": config.InternalGitLabServer,
"api-secret-key": *gitLabAPISecretKey,
"auth-redirect-uri": config.RedirectURI,
}).Debug("Start daemon with configuration")