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
5c827cf2
Commit
5c827cf2
authored
Mar 01, 2016
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
X Tweaks to run gitlab in development mode
parent
0e6efa5a
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
7 deletions
+24
-7
software/gitlab/gitlab-unicorn-startup.in
software/gitlab/gitlab-unicorn-startup.in
+1
-1
software/gitlab/instance-gitlab.cfg.in
software/gitlab/instance-gitlab.cfg.in
+3
-2
software/gitlab/software.cfg
software/gitlab/software.cfg
+14
-2
software/gitlab/template/database.yml.in
software/gitlab/template/database.yml.in
+4
-1
software/gitlab/template/resque.yml.in
software/gitlab/template/resque.yml.in
+2
-1
No files found.
software/gitlab/gitlab-unicorn-startup.in
View file @
5c827cf2
...
...
@@ -64,6 +64,6 @@ $RAKE cache:clear || die "cache:clear failed"
# 3. finally exec to unicorn
exec {{ gitlab_unicorn }} \
-E
production
\
-E
development
\
-c {{ unicorn_rb.rendered }} \
{{ gitlab_work.location }}/config.ru
software/gitlab/instance-gitlab.cfg.in
View file @
5c827cf2
...
...
@@ -285,7 +285,7 @@ wrapper-path = ${directory:bin}/${:_buildout_section_name_}
environment =
BUNDLE_GEMFILE = {{ gitlab_repository_location }}/Gemfile
HOME = ${directory:home}
RAILS_ENV =
production
RAILS_ENV =
development
SIDEKIQ_MEMORY_KILLER_MAX_RSS = ${instance-parameter:configuration.sidekiq_memory_killer_max_rss}
# NOTE sys.argv[1:] implicitly appended
...
...
@@ -525,6 +525,7 @@ command-line = {{ gitlab_workhorse }}
-listenAddr ${gitlab-workhorse:socket}
-authSocket ${unicorn:socket}
-documentRoot ${gitlab-work:location}/public
-developmentMode
# NOTE for profiling
# -pprofListenAddr ...
...
...
@@ -647,7 +648,7 @@ command-line =
# XXX -q runner ? (present in gitlab-ce/Procfile but not in omnibus)
# XXX -q pages -q elasticsearch ? (present in omnibus but not in gitlab-ce -- those features are gitlab-ee only)
# XXX -P ? (pidfile)
-e
production
-e
development
-r ${gitlab-work:location}
-t ${instance-parameter:configuration.sidekiq_shutdown_timeout}
-c ${instance-parameter:configuration.sidekiq_concurrency}
...
...
software/gitlab/software.cfg
View file @
5c827cf2
...
...
@@ -148,7 +148,9 @@ configure-command = cd ${:path} &&
make-binary =
make-targets= cd ${:path} &&
${:bundle} install --deployment --without development test mysql kerberos
${:bundle} install --deployment --without test mysql kerberos
#${:bundle} install --deployment --without development test mysql kerberos
# build needed-by-gitlab-shell gems via bundler
...
...
@@ -162,8 +164,9 @@ bundle = ${bundler-4gitlab:bundle}
configure-command = true
make-binary =
make-targets= cd ${:path} &&
${:bundle} install --deployment --without
development
test
${:bundle} install --deployment --without test
# ${:bundle} install --deployment --without development test
# build gitlab-workhorse
[gitlab-workhorse]
...
...
@@ -289,3 +292,12 @@ plone.recipe.command = 1.1
rubygemsrecipe = 0.2.2
slapos.recipe.template = 2.9
z3c.recipe.scripts = 1.0.1
[database.yml.in]
md5sum =
[gitlab-unicorn-startup.in]
md5sum =
[instance-gitlab.cfg.in]
md5sum =
[resque.yml.in]
md5sum =
software/gitlab/template/database.yml.in
View file @
5c827cf2
...
...
@@ -6,7 +6,7 @@
{% from 'macrolib.cfg.in' import cfg with context %}
production:
production:
&base
adapter: postgresql
encoding: unicode
{# collation is mainly for mysql
...
...
@@ -25,3 +25,6 @@ production:
sslmode: <%= single_quote(@db_sslmode) %>
sslrootcert: <%= single_quote(@db_sslrootcert) %>
#}
development:
<<: *base
software/gitlab/template/resque.yml.in
View file @
5c827cf2
...
...
@@ -4,4 +4,5 @@
# https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/resque.yml.erb
# (last udpdated for omnibus-gitlab 8.5.1+ce.0-1-ge732b39)
production: unix://{{ redis.unixsocket }}
production: &base unix://{{ redis.unixsocket }}
development: *base
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