Commit a74a096e authored by Kirill Smelkov's avatar Kirill Smelkov

X Refresh with gitlab 7.12

parent 2ed53bf4
+ remove ssh access
~ remove `sudo ...` (or fake it)
~ gitlab.yml: git -> bin_path
- setup basic ~/.gitconfig
- pull request with 1 patch -> merge fast-forward
- unicorn.rb + other configs (check vs omnibus)
- default project limit setting: 10 -> 50
? mail server (for email notifications)
+ it has bug with exim (https://github.com/gitlabhq/gitlabhq/issues/4866)
? `bundle exec rails console` exit/fails silently
http://localhost:3000/help/security/reset_root_password.md
? No effect after changing extra:sign_in_text (in gitlab.yml) and restarting gitlab foreman
http://localhost:3000/help/customization/welcome_message.md
NOTES
https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md
bundle exec rake <task> RAILS_ENV=production
gitlab:check
gitlab:env:info
gitlab:import:repos
gitlab:setup
gitlab:shell:install
gitlab:shell:setup
gitlab:sidekiq:*
gitlab:web_hook:{add,rm,list}
gitlab:test
Useful to understand:
https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/architecture.md
......@@ -7,4 +7,5 @@ partition_forinst() {
}
xslapos node software -v --only-sr `pwd`/software.cfg --pidfile $HOME/var/run/slapgrid-sr.pid && \
/bin/echo -ne '\n\n' && \
xslapos node instance -v --only-cp `partition_forinst gitlab1` --pidfile $HOME/var/run/slapgrid-cp.pid
......@@ -10,7 +10,7 @@ parts =
gitlab-rails
gitlab-rake
# std stuff for instance
# std stuff for slapos instance
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
offline = true
......@@ -59,6 +59,8 @@ command-line = ${bundler-4gitlab:bundle} exec rails "$@"
command-line = ${bundler-4gitlab:bundle} exec rake "$@"
# etc/
# service/
# unicorn
# sidekiq
......@@ -22,7 +22,7 @@ parts =
ktestbin
# TODO becomes autodependency
bundler-4gitlab
# bundler-4gitlab
gitlab-shell/vendor
gitlab/vendor/bundle
......@@ -67,8 +67,8 @@ gems = fluentd fluent-plugin-wendelin
# TODO say how this bundler/gitlab differ from usual slapos installation
[bundler-4gitlab]
recipe = rubygemsrecipe
# XXX ruby2.1 duplicated
ruby-executable = ${ruby2.1:location}/bin/ruby
ruby-location = ${ruby2.1:location}
ruby-executable = ${:ruby-location}/bin/ruby
gems = bundler
# bin installed here
......@@ -79,12 +79,11 @@ bundle = ${buildout:bin-directory}/bundle
# ( reason: rubygemsrecipe hardcodes PATH inside generated bin/* and it is
# impossible to adjust it later )
#
# Rugged needs: cmake, pkgconfig
# bundle exec <smth> ; <smth> starts with `#!/usr/bin/env ruby` as rubygems
# Rugged needs: cmake, pkgconfig
#
environment =
# XXX ruby2.1 duplicated
PATH = ${ruby2.1:location}/bin:${cmake:location}/bin:${pkgconfig:location}/bin:%(PATH)s
PATH = ${:ruby-location}/bin:${cmake:location}/bin:${pkgconfig:location}/bin:%(PATH)s
......@@ -94,14 +93,14 @@ environment =
[gitlab-repository]
recipe = slapos.recipe.build:gitclone
repository = https://gitlab.com/gitlab-org/gitlab-ce.git
revision = v7.11.2-0-gdac18e7728013a77410e926a1e64225703754a2d
revision = v7.12.0.rc3-0-gd5cbdcc7452e259f641dec0303a0a8bf61a62d18
location = ${buildout:parts-directory}/gitlab
git-executable = ${git:location}/bin/git
[gitlab-shell-repository]
recipe = slapos.recipe.build:gitclone
repository = https://gitlab.com/gitlab-org/gitlab-shell.git
# FIXME pin gitlab-shell version properly (wrt gitlab)
# FIXME pin gitlab-shell version properly (wrt gitlab) ?
revision = v2.6.3-0-g4d30c0c
location = ${buildout:parts-directory}/gitlab-shell
git-executable = ${git:location}/bin/git
......@@ -122,8 +121,6 @@ make-binary =
make-targets= cd ${:path} &&
${:bundle} install --deployment --without development test mysql kerberos
# # propagate location
# location = ${gitlab-repository:location}
# build needed-by-gitlab-shell gems via bundler
......@@ -140,10 +137,6 @@ make-targets= cd ${:path} &&
${:bundle} install --deployment --without development test
# # propagate location
# location = ${gitlab-shell-repository:location}/vendor/bundle
[instance.cfg]
......
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