Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos
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
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kirill Smelkov
slapos
Commits
24f90ea6
Commit
24f90ea6
authored
Oct 15, 2015
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
e47a1ebf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
6 deletions
+9
-6
software/gitlab/instance-gitlab.cfg.in
software/gitlab/instance-gitlab.cfg.in
+4
-2
software/gitlab/software.cfg
software/gitlab/software.cfg
+5
-4
No files found.
software/gitlab/instance-gitlab.cfg.in
View file @
24f90ea6
...
...
@@ -34,7 +34,7 @@ cert = ${slap-connection:cert-file}
# gitlab instance parameters
configuration.email_enabled = true
configuration.email_from =
admin
@example.com
configuration.email_from =
lab
@example.com
configuration.email_display_name = GitLab
configuration.email_reply_to = noreply@example.com
...
...
@@ -64,6 +64,7 @@ configuration.webhook_timeout = 10
# XXX empty ok (gitlab substitutes its own default ?)
# XXX or better explicitly make it 30 (omnibus default) ?
# TODO -> remove
configuration.satellites_timeout =
# 0 means forever (seconds)
...
...
@@ -197,6 +198,7 @@ environment =
# HOME = ... (needed ?) better yes
# PATH = ... TODO
RAILS_ENV = production
# XXX here vvv ?
SIDEKIQ_MEMORY_KILLER_MAX_RSS = 1000000
[gitlab-rails]
...
...
@@ -244,7 +246,7 @@ command-line =
#
# we clone cloned gitlab and add proper links to vendor/bundle and instance
# config files.
# XXX there is no need fo full clone - we only need worktree checkout (a-la git
# XXX there is no need fo
r
full clone - we only need worktree checkout (a-la git
# worktree add, but without creating files in original clone)
#
# This way Gitlab/Rails still think they work in 1 code / 1 instance way,
...
...
software/gitlab/software.cfg
View file @
24f90ea6
...
...
@@ -189,6 +189,7 @@ destination = ${buildout:directory}/instance-gitlab.cfg.in
# TODO parts/database.yml.in/database.yml.in -> parts/database.yml.in
# XXX -> slapos.recipe.build:download (with destination) ?
[download-template]
recipe = slapos.recipe.download
download-only = true
...
...
@@ -196,19 +197,19 @@ url = ${:_profile_base_location_}/template/${:_buildout_section_name_}
[database.yml.in]
<= download-template
#
TODO md5sum
#
md5sum = TODO
[gitlab.yml.in]
<= download-template
#
TODO md5sum
#
md5sum = TODO
[resque.yml.in]
<= download-template
#
TODO md5sum
#
md5sum = TODO
[smtp_settings.rb.in]
<= download-template
#
TODO md5sum
#
md5sum = TODO
...
...
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