From 7a9d333b2dd32a6fb98366617614a57fa2c58d50 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 26 Dec 2017 11:07:06 +0100 Subject: [PATCH] Remove GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_WAIT_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 bbac2d1c..511d2b49 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,6 +6,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **10.3.0** - gitlab: upgrade CE to v10.3.0 - REMOVED `GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_COUNT_THRESHOLD` +- REMOVED `GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_WAIT_TIME` **10.2.5** - gitlab: upgrade CE to v10.2.5 diff --git a/README.md b/README.md index faa07af7..d3b8b2fc 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_WAIT_TIME` | Sets the time in seconds after an access failure before allowing access again. Defaults to `30`. | | `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` | diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 11b25f2d..b829542c 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_wait_time: {{GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_WAIT_TIME}} # Seconds after an access failure before allowing access again 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 diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 1af1166f..7bdb6484 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_WAIT_TIME=${GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_WAIT_TIME:-30} 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 deec5594..da1e9690 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_WAIT_TIME \ GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_RESET_TIME \ GITLAB_REPOSITORIES_STORAGES_DEFAULT_STORAGE_TIMEOUT \ GITLAB_DOWNLOADS_DIR \