From 91157bca06dddad63a7223d5f55387c76546bd36 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 26 Dec 2017 11:08:18 +0100 Subject: [PATCH] Remove GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_RESET_TIME Signed-off-by: solidnerd --- Changelog.md | 1 + README.md | 1 - assets/runtime/config/gitlabhq/gitlab.yml | 1 - assets/runtime/env-defaults | 1 - assets/runtime/functions | 1 - 5 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Changelog.md b/Changelog.md index 511d2b49..e53b4101 100644 --- a/Changelog.md +++ b/Changelog.md @@ -7,6 +7,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o - gitlab: upgrade CE to v10.3.0 - REMOVED `GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_COUNT_THRESHOLD` - REMOVED `GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_WAIT_TIME` +- REMOVED `GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_RESET_TIME` **10.2.5** - gitlab: upgrade CE to v10.2.5 diff --git a/README.md b/README.md index d3b8b2fc..74d60ed7 100644 --- a/README.md +++ b/README.md @@ -842,7 +842,6 @@ Below is the complete list of available options that can be used to customize yo | `GITLAB_NOTIFY_ON_BROKEN_BUILDS` | Enable or disable broken build notification emails. Defaults to `true` | | `GITLAB_NOTIFY_PUSHER` | Add pusher to recipients list of broken build notification emails. Defaults to `false` | | `GITLAB_REPOS_DIR` | The git repositories folder in the container. Defaults to `/home/git/data/repositories` | -| `GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_RESET_TIME` | Sets the time in seconds to expire failures. Defaults to `1800`. | | `GITLAB_REPOSITORIES_STORAGES_DEFAULT_STORAGE_TIMEOUT` | Sets the time in seconds to wait before aborting a storage access attempt. Defaults to `5`. | | `GITLAB_BACKUP_DIR` | The backup folder in the container. Defaults to `/home/git/data/backups` | | `GITLAB_BUILDS_DIR` | The build traces directory. Defaults to `/home/git/data/builds` | diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index b829542c..57d49ccc 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -493,7 +493,6 @@ production: &base default: path: {{GITLAB_REPOS_DIR}}/ gitaly_address: unix:/home/git/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port) - failure_reset_time: {{GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_RESET_TIME}} # Time in seconds to expire failures storage_timeout: {{GITLAB_REPOSITORIES_STORAGES_DEFAULT_STORAGE_TIMEOUT}} # Time in seconds to wait before aborting a storage access attempt ## Backup settings diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 7bdb6484..65195caf 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -9,7 +9,6 @@ GITLAB_REPOS_DIR="${GITLAB_REPOS_DIR:-$GITLAB_DATA_DIR/repositories}" GITLAB_BUILDS_DIR="${GITLAB_BUILDS_DIR:-$GITLAB_DATA_DIR/builds}" GITLAB_DOWNLOADS_DIR="${GITLAB_DOWNLOADS_DIR:-$GITLAB_TEMP_DIR/downloads}" GITLAB_SHARED_DIR="${GITLAB_SHARED_DIR:-$GITLAB_DATA_DIR/shared}" -GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_RESET_TIME=${GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_RESET_TIME:-1800} GITLAB_REPOSITORIES_STORAGES_DEFAULT_STORAGE_TIMEOUT=${GITLAB_REPOSITORIES_STORAGES_DEFAULT_STORAGE_TIMEOUT:-5} diff --git a/assets/runtime/functions b/assets/runtime/functions index da1e9690..8b45def9 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1421,7 +1421,6 @@ configure_gitlab() { GITLAB_SHELL_INSTALL_DIR \ GITLAB_DATA_DIR \ GITLAB_REPOS_DIR \ - GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_RESET_TIME \ GITLAB_REPOSITORIES_STORAGES_DEFAULT_STORAGE_TIMEOUT \ GITLAB_DOWNLOADS_DIR \ GITLAB_SHARED_DIR \