summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2019-07-24 20:11:49 +0000
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2019-07-24 20:11:49 +0000
commitfeb07ce08e755786ec869f31eef57c67d70eecb7 (patch)
treea7e1577722757be47e3a183b9a5239d48c3e598a /config
parent6dcde68b6dbce7190ef78e7fef280b634b549450 (diff)
parent1902d9cc74a1dc2c87fdbb39a6cdbb67092cbb5a (diff)
downloadgitlab-ce-feb07ce08e755786ec869f31eef57c67d70eecb7.tar.gz
Merge branch 'ce-docker_image_replication-event-generation' into 'master'
Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14597 See merge request gitlab-org/gitlab-ce!30520
Diffstat (limited to 'config')
-rw-r--r--config/gitlab.yml.example9
-rw-r--r--config/initializers/1_settings.rb1
2 files changed, 10 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 0e78980350f..dd53127ac2c 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -400,6 +400,15 @@ production: &base
# path: shared/registry
# issuer: gitlab-issuer
+ # Add notification settings if you plan to use Geo Replication for the registry
+ # notifications:
+ # - name: geo_event
+ # url: https://example.com/api/v4/container_registry_event/events
+ # timeout: 2s
+ # threshold: 5
+ # backoff: 1s
+ # headers:
+ # Authorization: secret_phrase
## Error Reporting and Logging with Sentry
sentry:
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 494c4dd1f93..32fec7c3d22 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -259,6 +259,7 @@ Settings.registry['key'] ||= nil
Settings.registry['issuer'] ||= nil
Settings.registry['host_port'] ||= [Settings.registry['host'], Settings.registry['port']].compact.join(':')
Settings.registry['path'] = Settings.absolute(Settings.registry['path'] || File.join(Settings.shared['path'], 'registry'))
+Settings.registry['notifications'] ||= []
#
# Error Reporting and Logging with Sentry