diff options
| author | vtak <vtak@gitlab.com> | 2022-03-15 08:56:50 +0300 |
|---|---|---|
| committer | vtak <vtak@gitlab.com> | 2022-03-15 08:56:50 +0300 |
| commit | 824d87ab55702ae2b65d7f2c04284456dba33e02 (patch) | |
| tree | 42c55ab85e6c33a52c20cf48354e0056aa0ca051 /internal/config | |
| parent | 29cb5da295e31d18c29c544a8f43f8006b3e874d (diff) | |
| parent | d71ac3098fec1d7ed54ddd322ff061aaf642ec9b (diff) | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-pages into feature/zip-http-timeout-param
Diffstat (limited to 'internal/config')
| -rw-r--r-- | internal/config/config.go | 2 | ||||
| -rw-r--r-- | internal/config/flags.go | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/internal/config/config.go b/internal/config/config.go index 101bc701..48bab76e 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -85,6 +85,7 @@ type Auth struct { ClientSecret string RedirectURI string Scope string + Timeout time.Duration } // Cache configuration for GitLab API @@ -220,6 +221,7 @@ func loadConfig() (*Config, error) { ClientSecret: *clientSecret, RedirectURI: *redirectURI, Scope: *authScope, + Timeout: *authTimeout, }, Log: Log{ Format: *logFormat, diff --git a/internal/config/flags.go b/internal/config/flags.go index 425e55a2..0e28db73 100644 --- a/internal/config/flags.go +++ b/internal/config/flags.go @@ -70,6 +70,7 @@ var ( clientSecret = flag.String("auth-client-secret", "", "GitLab application Client Secret") redirectURI = flag.String("auth-redirect-uri", "", "GitLab application redirect URI") authScope = flag.String("auth-scope", "api", "Scope to be used for authentication (must match GitLab Pages OAuth application settings)") + authTimeout = flag.Duration("auth-timeout", 5*time.Second, "GitLab application client timeout for authentication") maxConns = flag.Int("max-conns", 0, "Limit on the number of concurrent connections to the HTTP, HTTPS or proxy listeners, 0 for no limit") maxURILength = flag.Int("max-uri-length", 1024, "Limit the length of URI, 0 for unlimited.") insecureCiphers = flag.Bool("insecure-ciphers", false, "Use default list of cipher suites, may contain insecure ones like 3DES and RC4") |