Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
7d5154d2
Commit
7d5154d2
authored
Jul 06, 2017
by
Gabriel Mazetto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove geo_primary_role and geo_secondary_role configs and methods
parent
1ea4b4d0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
22 deletions
+0
-22
config/gitlab.yml.example
config/gitlab.yml.example
+0
-10
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+0
-4
lib/gitlab/geo.rb
lib/gitlab/geo.rb
+0
-8
No files found.
config/gitlab.yml.example
View file @
7d5154d2
...
...
@@ -644,12 +644,6 @@ production: &base
ip_whitelist:
- 127.0.0.0/8
## GitLab Geo settings (EE-only)
geo_primary_role:
enabled: false
geo_secondary_role:
enabled: false
#
# 5. Extra customization
# ==========================
...
...
@@ -780,10 +774,6 @@ test:
user_filter: ''
group_base: 'ou=groups,dc=example,dc=com'
admin_group: ''
geo_primary_role:
enabled: true
geo_secondary_role:
enabled: false
staging:
<<: *base
config/initializers/1_settings.rb
View file @
7d5154d2
...
...
@@ -349,10 +349,6 @@ Settings.pages['external_https'] ||= false unless Settings.pages['external_http
# Geo
#
Settings
.
gitlab
[
'geo_status_timeout'
]
||=
10
Settings
[
'geo_primary_role'
]
||=
Settingslogic
.
new
({})
Settings
.
geo_primary_role
[
'enabled'
]
=
false
if
Settings
.
geo_primary_role
[
'enabled'
].
nil?
Settings
[
'geo_secondary_role'
]
||=
Settingslogic
.
new
({})
Settings
.
geo_secondary_role
[
'enabled'
]
=
false
if
Settings
.
geo_secondary_role
[
'enabled'
].
nil?
#
# Git LFS
...
...
lib/gitlab/geo.rb
View file @
7d5154d2
...
...
@@ -41,14 +41,6 @@ module Gitlab
Gitlab
::
Geo
.
current_node
.
reload
.
enabled?
end
def
self
.
primary_role_enabled?
Gitlab
.
config
.
geo_primary_role
[
'enabled'
]
end
def
self
.
secondary_role_enabled?
Gitlab
.
config
.
geo_secondary_role
[
'enabled'
]
end
def
self
.
geo_database_configured?
Rails
.
configuration
.
respond_to?
(
:geo_database
)
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment