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
066eeb8f
Commit
066eeb8f
authored
Dec 14, 2015
by
Gabriel Mazetto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Sidekiq-cron configuration changes for EE version
parent
a22a6719
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
3 deletions
+29
-3
app/workers/ldap_sync_worker.rb
app/workers/ldap_sync_worker.rb
+1
-0
config/gitlab.yml.example
config/gitlab.yml.example
+18
-1
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+10
-2
No files found.
app/workers/ldap_sync_worker.rb
View file @
066eeb8f
...
...
@@ -4,6 +4,7 @@ class LdapSyncWorker
sidekiq_options
retry:
false
def
perform
return
unless
Gitlab
.
config
.
ldap
.
enabled
Rails
.
logger
.
info
"Performing daily LDAP sync task."
User
.
ldap
.
find_each
(
batch_size:
100
).
each
do
|
ldap_user
|
Rails
.
logger
.
debug
"Syncing user
#{
ldap_user
.
username
}
,
#{
ldap_user
.
email
}
"
...
...
config/gitlab.yml.example
View file @
066eeb8f
...
...
@@ -145,13 +145,30 @@ production: &base
# ssl_url: "https://..." # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon
## Auxiliary jobs
# Periodically executed jobs, to self-heal Git
l
ab, do external synchronizations, etc.
# Periodically executed jobs, to self-heal Git
L
ab, do external synchronizations, etc.
# Please read here for more information: https://github.com/ondrejbartas/sidekiq-cron#adding-cron-job
cron_jobs:
# Flag stuck CI builds as failed
stuck_ci_builds_worker:
cron: "0 0 * * *"
##
# GitLab EE only jobs:
# Snapshot active users statistics
historical_data_worker:
cron: "0 12 * * *"
# Update mirrored repositories
update_all_mirrors_worker:
cron: "0 * * * *"
# In addition to refreshing users when they log in,
# periodically refresh LDAP users membership.
# NOTE: This will only take effect if LDAP is enabled
ldap_sync_worker:
cron: "30 1 * * *"
#
# 2. GitLab CI settings
...
...
config/initializers/1_settings.rb
View file @
066eeb8f
...
...
@@ -284,7 +284,15 @@ Settings['cron_jobs'] ||= Settingslogic.new({})
Settings
.
cron_jobs
[
'stuck_ci_builds_worker'
]
||=
Settingslogic
.
new
({})
Settings
.
cron_jobs
[
'stuck_ci_builds_worker'
][
'cron'
]
||=
'0 0 * * *'
Settings
.
cron_jobs
[
'stuck_ci_builds_worker'
][
'class'
]
=
'StuckCiBuildsWorker'
Settings
.
cron_jobs
[
'historical_data_worker'
]
||=
Settingslogic
.
new
({})
Settings
.
cron_jobs
[
'historical_data_worker'
][
'cron'
]
||=
'0 12 * * *'
Settings
.
cron_jobs
[
'historical_data_worker'
][
'class'
]
=
'HistoricalDataWorker'
Settings
.
cron_jobs
[
'update_all_mirrors_worker'
]
||=
Settingslogic
.
new
({})
Settings
.
cron_jobs
[
'update_all_mirrors_worker'
][
'cron'
]
||=
'0 * * * *'
Settings
.
cron_jobs
[
'update_all_mirrors_worker'
][
'class'
]
=
'UpdateAllMirrorsWorker'
Settings
.
cron_jobs
[
'ldap_sync_worker'
]
||=
Settingslogic
.
new
({})
Settings
.
cron_jobs
[
'ldap_sync_worker'
][
'cron'
]
||=
'30 1 * * *'
Settings
.
cron_jobs
[
'ldap_sync_worker'
][
'class'
]
=
'LdapSyncWorker'
#
# GitLab Shell
...
...
@@ -340,7 +348,7 @@ Settings['kerberos'] ||= Settingslogic.new({})
Settings
.
kerberos
[
'enabled'
]
=
false
if
Settings
.
kerberos
[
'enabled'
].
nil?
Settings
.
kerberos
[
'keytab'
]
=
nil
if
Settings
.
kerberos
[
'keytab'
].
blank?
#nil means use default keytab
Settings
.
kerberos
[
'service_principal_name'
]
=
nil
if
Settings
.
kerberos
[
'service_principal_name'
].
blank?
#nil means any SPN in keytab
Settings
.
kerberos
[
'use_dedicated_port'
]
=
false
if
Settings
.
kerberos
[
'use_dedicated_port'
].
nil?
Settings
.
kerberos
[
'use_dedicated_port'
]
=
false
if
Settings
.
kerberos
[
'use_dedicated_port'
].
nil?
Settings
.
kerberos
[
'https'
]
=
Settings
.
gitlab
.
https
if
Settings
.
kerberos
[
'https'
].
nil?
Settings
.
kerberos
[
'port'
]
||=
Settings
.
kerberos
.
https
?
8443
:
8088
...
...
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