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:
authorJaime Martinez <jmartinez@gitlab.com>2020-05-15 09:21:26 +0300
committerJaime Martinez <jmartinez@gitlab.com>2020-05-18 03:14:19 +0300
commit70c910b8ca7ed57251b1bd043793430e4e9f4052 (patch)
treefaa55d8ae7545fe8de5ac0015ae4acd1ad6c0672 /main.go
parentb6cdfe830c9d0250f036acf69c9585bf4ec7b947 (diff)
Add domain-source config flag
This is an incremental step for adding `-domain-source` as described in https://gitlab.com/gitlab-org/gitlab/-/issues/217912. We are only adding the flag here but it's not doing anything at the moment. Add TODO for implementation
Diffstat (limited to 'main.go')
-rw-r--r--main.go17
1 files changed, 10 insertions, 7 deletions
diff --git a/main.go b/main.go
index 2614fa0b..17cce4a2 100644
--- a/main.go
+++ b/main.go
@@ -65,13 +65,15 @@ var (
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)")
- 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")
- maxConns = flag.Uint("max-conns", 5000, "Limit on the number of concurrent connections to the HTTP, HTTPS or proxy listeners")
- insecureCiphers = flag.Bool("insecure-ciphers", false, "Use default list of cipher suites, may contain insecure ones like 3DES and RC4")
- tlsMinVersion = flag.String("tls-min-version", "tls1.2", tlsconfig.FlagUsage("min"))
- tlsMaxVersion = flag.String("tls-max-version", "", tlsconfig.FlagUsage("max"))
+ // TODO: implement functionality for disk, auto and gitlab https://gitlab.com/gitlab-org/gitlab/-/issues/217912
+ domainSource = flag.String("domain-source", "disk", "Domain configuration source 'disk', 'auto' or 'gitlab' (default: 'disk')")
+ 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")
+ maxConns = flag.Uint("max-conns", 5000, "Limit on the number of concurrent connections to the HTTP, HTTPS or proxy listeners")
+ insecureCiphers = flag.Bool("insecure-ciphers", false, "Use default list of cipher suites, may contain insecure ones like 3DES and RC4")
+ tlsMinVersion = flag.String("tls-min-version", "tls1.2", tlsconfig.FlagUsage("min"))
+ tlsMaxVersion = flag.String("tls-max-version", "", tlsconfig.FlagUsage("max"))
disableCrossOriginRequests = flag.Bool("disable-cross-origin-requests", false, "Disable cross-origin requests")
@@ -193,6 +195,7 @@ func configFromFlags() appConfig {
config.InternalGitLabServer = internalGitLabServerFromFlags()
config.GitlabClientHTTPTimeout = *gitlabClientHTTPTimeout
config.GitlabJWTTokenExpiration = *gitlabClientJWTExpiry
+ config.DomainSource = *domainSource
config.StoreSecret = *secret
config.ClientID = *clientID
config.ClientSecret = *clientSecret