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

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'internal/config/config.go')
-rw-r--r--internal/config/config.go20
1 files changed, 16 insertions, 4 deletions
diff --git a/internal/config/config.go b/internal/config/config.go
index 0f041f2a9..a528fee70 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -58,14 +58,26 @@ type TLS struct {
// GitlabShell contains the settings required for executing `gitlab-shell`
type GitlabShell struct {
- Dir string `toml:"dir"`
+ CustomHooksDir string `toml:"custom_hooks_dir"`
+ Dir string `toml:"dir"`
+ GitlabURL string `toml:"gitlab_url"`
+ HTTPSettings HTTPSettings `toml:"http-settings"`
+ SecretFile string `toml:"secret_file"`
+}
+
+type HTTPSettings struct {
+ ReadTimeout int `toml:"read_timeout" json:"read_timeout"`
+ User string `toml:"user" json:"user"`
+ Password string `toml:"password" json:"password"`
+ CAFile string `toml:"ca_file" json:"ca_file"`
+ CAPath string `toml:"ca_path" json:"ca_path"`
+ SelfSigned bool `toml:"self_signed_cert" json:"self_signed_cert"`
}
// Git contains the settings for the Git executable
type Git struct {
- BinPath string `toml:"bin_path"`
-
- CatfileCacheSize int `toml:"catfile_cache_size"`
+ BinPath string `toml:"bin_path"`
+ CatfileCacheSize int `toml:"catfile_cache_size"`
}
// Storage contains a single storage-shard