Commit 24f90ea6 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent e47a1ebf
...@@ -34,7 +34,7 @@ cert = ${slap-connection:cert-file} ...@@ -34,7 +34,7 @@ cert = ${slap-connection:cert-file}
# gitlab instance parameters # gitlab instance parameters
configuration.email_enabled = true configuration.email_enabled = true
configuration.email_from = admin@example.com configuration.email_from = lab@example.com
configuration.email_display_name = GitLab configuration.email_display_name = GitLab
configuration.email_reply_to = noreply@example.com configuration.email_reply_to = noreply@example.com
...@@ -64,6 +64,7 @@ configuration.webhook_timeout = 10 ...@@ -64,6 +64,7 @@ configuration.webhook_timeout = 10
# XXX empty ok (gitlab substitutes its own default ?) # XXX empty ok (gitlab substitutes its own default ?)
# XXX or better explicitly make it 30 (omnibus default) ? # XXX or better explicitly make it 30 (omnibus default) ?
# TODO -> remove
configuration.satellites_timeout = configuration.satellites_timeout =
# 0 means forever (seconds) # 0 means forever (seconds)
...@@ -197,6 +198,7 @@ environment = ...@@ -197,6 +198,7 @@ environment =
# HOME = ... (needed ?) better yes # HOME = ... (needed ?) better yes
# PATH = ... TODO # PATH = ... TODO
RAILS_ENV = production RAILS_ENV = production
# XXX here vvv ?
SIDEKIQ_MEMORY_KILLER_MAX_RSS = 1000000 SIDEKIQ_MEMORY_KILLER_MAX_RSS = 1000000
[gitlab-rails] [gitlab-rails]
...@@ -244,7 +246,7 @@ command-line = ...@@ -244,7 +246,7 @@ command-line =
# #
# we clone cloned gitlab and add proper links to vendor/bundle and instance # we clone cloned gitlab and add proper links to vendor/bundle and instance
# config files. # config files.
# XXX there is no need fo full clone - we only need worktree checkout (a-la git # XXX there is no need for full clone - we only need worktree checkout (a-la git
# worktree add, but without creating files in original clone) # worktree add, but without creating files in original clone)
# #
# This way Gitlab/Rails still think they work in 1 code / 1 instance way, # This way Gitlab/Rails still think they work in 1 code / 1 instance way,
......
...@@ -189,6 +189,7 @@ destination = ${buildout:directory}/instance-gitlab.cfg.in ...@@ -189,6 +189,7 @@ destination = ${buildout:directory}/instance-gitlab.cfg.in
# TODO parts/database.yml.in/database.yml.in -> parts/database.yml.in # TODO parts/database.yml.in/database.yml.in -> parts/database.yml.in
# XXX -> slapos.recipe.build:download (with destination) ?
[download-template] [download-template]
recipe = slapos.recipe.download recipe = slapos.recipe.download
download-only = true download-only = true
...@@ -196,19 +197,19 @@ url = ${:_profile_base_location_}/template/${:_buildout_section_name_} ...@@ -196,19 +197,19 @@ url = ${:_profile_base_location_}/template/${:_buildout_section_name_}
[database.yml.in] [database.yml.in]
<= download-template <= download-template
# TODO md5sum # md5sum = TODO
[gitlab.yml.in] [gitlab.yml.in]
<= download-template <= download-template
# TODO md5sum # md5sum = TODO
[resque.yml.in] [resque.yml.in]
<= download-template <= download-template
# TODO md5sum # md5sum = TODO
[smtp_settings.rb.in] [smtp_settings.rb.in]
<= download-template <= download-template
# TODO md5sum # md5sum = TODO
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment