Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Carlos Ramos Carreño
slapos
Commits
33754657
Commit
33754657
authored
May 19, 2020
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gitlab-sr: upgrade to version 11.11.8
parent
443765f3
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
98 additions
and
80 deletions
+98
-80
software/gitlab/buildout.hash.cfg
software/gitlab/buildout.hash.cfg
+6
-6
software/gitlab/gitlab-unicorn-startup.in
software/gitlab/gitlab-unicorn-startup.in
+4
-5
software/gitlab/gowork.cfg
software/gitlab/gowork.cfg
+1
-1
software/gitlab/instance-gitlab.cfg.in
software/gitlab/instance-gitlab.cfg.in
+11
-3
software/gitlab/software.cfg
software/gitlab/software.cfg
+45
-41
software/gitlab/template/gitlab-shell-config.yml.in
software/gitlab/template/gitlab-shell-config.yml.in
+1
-1
software/gitlab/template/gitlab.yml.in
software/gitlab/template/gitlab.yml.in
+10
-0
software/gitlab/template/template-gitlab-resiliency-restore.sh.in
.../gitlab/template/template-gitlab-resiliency-restore.sh.in
+7
-0
software/gitlab/template/unicorn.rb.in
software/gitlab/template/unicorn.rb.in
+13
-23
No files found.
software/gitlab/buildout.hash.cfg
View file @
33754657
...
@@ -38,15 +38,15 @@ md5sum = c2e23c0f7baa1633df0436ca4e728424
...
@@ -38,15 +38,15 @@ md5sum = c2e23c0f7baa1633df0436ca4e728424
[gitlab-shell-config.yml.in]
[gitlab-shell-config.yml.in]
_update_hash_filename_ = template/gitlab-shell-config.yml.in
_update_hash_filename_ = template/gitlab-shell-config.yml.in
md5sum =
52d18b521b8cd16352fc88b1e1d79d53
md5sum =
9920d10442604f5d8a736825f20ebd2a
[gitlab-unicorn-startup.in]
[gitlab-unicorn-startup.in]
_update_hash_filename_ = gitlab-unicorn-startup.in
_update_hash_filename_ = gitlab-unicorn-startup.in
md5sum =
aff91edaf9786c213db8ea703ab3571e
md5sum =
240957eac87e0b074589acd27d284e04
[gitlab.yml.in]
[gitlab.yml.in]
_update_hash_filename_ = template/gitlab.yml.in
_update_hash_filename_ = template/gitlab.yml.in
md5sum =
f4cc0bc898b8d59010d61473e2adc53b
md5sum =
bedbfc03eaf3560a93cfde1f497e99f6
[gitaly-config.toml.in]
[gitaly-config.toml.in]
_update_hash_filename_ = template/gitaly-config.toml.in
_update_hash_filename_ = template/gitaly-config.toml.in
...
@@ -54,7 +54,7 @@ md5sum = 056d7ed09e1bf20d022d3ef6b9363e00
...
@@ -54,7 +54,7 @@ md5sum = 056d7ed09e1bf20d022d3ef6b9363e00
[instance-gitlab.cfg.in]
[instance-gitlab.cfg.in]
_update_hash_filename_ = instance-gitlab.cfg.in
_update_hash_filename_ = instance-gitlab.cfg.in
md5sum =
6effe68f7ef240780d1027dd834a562c
md5sum =
52abdcb629c513cfa1c31d47ac082c16
[instance-gitlab-export.cfg.in]
[instance-gitlab-export.cfg.in]
_update_hash_filename_ = instance-gitlab-export.cfg.in
_update_hash_filename_ = instance-gitlab-export.cfg.in
...
@@ -90,8 +90,8 @@ md5sum = e2144b03f7247636143c65dc81550d75
...
@@ -90,8 +90,8 @@ md5sum = e2144b03f7247636143c65dc81550d75
[template-gitlab-resiliency-restore.sh.in]
[template-gitlab-resiliency-restore.sh.in]
_update_hash_filename_ = template/template-gitlab-resiliency-restore.sh.in
_update_hash_filename_ = template/template-gitlab-resiliency-restore.sh.in
md5sum =
590fcadf26085fdd17487175bc0a469d
md5sum =
f85c5bf252b8756558f40c8b110731cf
[unicorn.rb.in]
[unicorn.rb.in]
_update_hash_filename_ = template/unicorn.rb.in
_update_hash_filename_ = template/unicorn.rb.in
md5sum =
67728235a2c4c9425c80f0c856749885
md5sum =
046cee1a8a024e55f8e64078b1fd5cb2
software/gitlab/gitlab-unicorn-startup.in
View file @
33754657
...
@@ -43,11 +43,6 @@ if echo "$pgtables" | grep -q '^Did not find any relations' ; then
...
@@ -43,11 +43,6 @@ if echo "$pgtables" | grep -q '^Did not find any relations' ; then
fi
fi
# re-build ssh keys
# (we do not use them - just for cleannes)
force=yes $RAKE gitlab:shell:setup || die "gitlab:shell:setup failed"
# 2. what to do when instance is upgraded
# 2. what to do when instance is upgraded
# see
# see
# https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/support/deploy/deploy.sh
# https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/support/deploy/deploy.sh
...
@@ -68,6 +63,10 @@ test -s $migrate_log || rm $migrate_log
...
@@ -68,6 +63,10 @@ test -s $migrate_log || rm $migrate_log
# clear cache
# clear cache
$RAKE cache:clear || die "cache:clear failed"
$RAKE cache:clear || die "cache:clear failed"
# re-build ssh keys
# (we do not use them - just for cleannes)
# run before migration to avoir error on missing tables in db
force=yes $RAKE gitlab:shell:setup || die "gitlab:shell:setup failed"
# 3. finally exec to unicorn
# 3. finally exec to unicorn
...
...
software/gitlab/gowork.cfg
View file @
33754657
...
@@ -25,7 +25,7 @@ revision = v0.8.0-12-g816c908556
...
@@ -25,7 +25,7 @@ revision = v0.8.0-12-g816c908556
<= go-git-package
<= go-git-package
go.importpath = lab.nexedi.com/kirr/git-backup
go.importpath = lab.nexedi.com/kirr/git-backup
repository = https://lab.nexedi.com/kirr/git-backup.git
repository = https://lab.nexedi.com/kirr/git-backup.git
revision =
3f6c4deec8834bdcd2c28c7c5eeacd8211e759b5
revision =
0985ff32d6b04c9d3c6124c0a46c239790151b81
[go_lab.nexedi.com_kirr_go123]
[go_lab.nexedi.com_kirr_go123]
<= go-git-package
<= go-git-package
...
...
software/gitlab/instance-gitlab.cfg.in
View file @
33754657
...
@@ -432,6 +432,7 @@ tune-command =
...
@@ -432,6 +432,7 @@ tune-command =
software = {{ gitlab_shell_repository_location }}
software = {{ gitlab_shell_repository_location }}
tune-command =
tune-command =
cp ${:software}/bin/* bin &&
ln -sf ${gitlab-shell-config.yml:rendered} config.yml &&
ln -sf ${gitlab-shell-config.yml:rendered} config.yml &&
true
true
...
@@ -537,6 +538,7 @@ config-command = ${service-redis:promise_wrapper}
...
@@ -537,6 +538,7 @@ config-command = ${service-redis:promise_wrapper}
<= logrotate-entry-base
<= logrotate-entry-base
log = ${redis:log}/*.log
log = ${redis:log}/*.log
name = redis
name = redis
truncate = true
########################
########################
...
@@ -563,6 +565,7 @@ command-line = {{ gitlab_workhorse }}
...
@@ -563,6 +565,7 @@ command-line = {{ gitlab_workhorse }}
-documentRoot ${gitlab-work:location}/public
-documentRoot ${gitlab-work:location}/public
-secretPath ${gitlab-workhorse:secret}
-secretPath ${gitlab-workhorse:secret}
-logFile ${gitlab-workhorse:log}
-logFile ${gitlab-workhorse:log}
-repoPath ${gitlab-repo-dir:repositories}
# NOTE for profiling
# NOTE for profiling
# -pprofListenAddr ...
# -pprofListenAddr ...
...
@@ -650,22 +653,26 @@ command-line = ${:rake} gitlab:gitlab_shell:check
...
@@ -650,22 +653,26 @@ command-line = ${:rake} gitlab:gitlab_shell:check
[logrotate-entry-unicorn]
[logrotate-entry-unicorn]
<= logrotate-entry-base
<= logrotate-entry-base
log = ${unicorn:log}/*.log
log = ${unicorn:log}/*.log
name = unicorn
name = unicorn
truncate = true
[logrotate-entry-gitlab]
[logrotate-entry-gitlab]
<= logrotate-entry-base
<= logrotate-entry-base
log = ${gitlab:log}/*.log
log = ${gitlab:log}/*.log
name = gitlab
name = gitlab
truncate = true
[logrotate-entry-gitlab-shell]
[logrotate-entry-gitlab-shell]
<= logrotate-entry-base
<= logrotate-entry-base
log = ${gitlab-shell:log}/*.log
log = ${gitlab-shell:log}/*.log
name = gitlab-shell
name = gitlab-shell
truncate = true
[logrotate-entry-gitlab-workhorse]
[logrotate-entry-gitlab-workhorse]
<= logrotate-entry-base
<= logrotate-entry-base
log = ${gitlab-workhorse-dir:log}//*.log
log = ${gitlab-workhorse-dir:log}//*.log
name = gitlab-shell
name = gitlab-workhorse
truncate = true
#######################################
#######################################
# sidekiq background jobs manager #
# sidekiq background jobs manager #
...
@@ -715,6 +722,7 @@ command-line = ${:rake} gitlab:sidekiq:check
...
@@ -715,6 +722,7 @@ command-line = ${:rake} gitlab:sidekiq:check
<= logrotate-entry-base
<= logrotate-entry-base
log = ${sidekiq:log}/*.log
log = ${sidekiq:log}/*.log
name = sidekiq
name = sidekiq
truncate = true
######################
######################
...
@@ -787,6 +795,7 @@ module = check_url_available
...
@@ -787,6 +795,7 @@ module = check_url_available
<= logrotate-entry-base
<= logrotate-entry-base
log = ${nginx:log}/*.log
log = ${nginx:log}/*.log
name = nginx
name = nginx
post = kill -USR1 $(cat ${directory:run}/nginx.pid)
# base entry for clients who registers to cron
# base entry for clients who registers to cron
[cron-entry]
[cron-entry]
...
@@ -832,7 +841,6 @@ command =
...
@@ -832,7 +841,6 @@ command =
${:rake} gitlab:assets:clean &&
${:rake} gitlab:assets:clean &&
${:rake} gettext:compile RAILS_ENV=production &&
${:rake} gettext:compile RAILS_ENV=production &&
cd ${gitlab-work:location} &&
cd ${gitlab-work:location} &&
PATH={{ node_bin_location }}:$PATH {{ yarn_location }}/bin/yarn add ajv@^4.11.2 &&
PATH={{ node_bin_location }}:$PATH {{ yarn_location }}/bin/yarn install --production --pure-lockfile &&
PATH={{ node_bin_location }}:$PATH {{ yarn_location }}/bin/yarn install --production --pure-lockfile &&
${:rake} gitlab:assets:compile NODE_ENV=production NODE_OPTIONS="--max_old_space_size=4096" &&
${:rake} gitlab:assets:compile NODE_ENV=production NODE_OPTIONS="--max_old_space_size=4096" &&
true
true
...
...
software/gitlab/software.cfg
View file @
33754657
...
@@ -15,7 +15,6 @@ extends =
...
@@ -15,7 +15,6 @@ extends =
../../component/openssl/buildout.cfg
../../component/openssl/buildout.cfg
../../component/nginx/buildout.cfg
../../component/nginx/buildout.cfg
../../component/zlib/buildout.cfg
../../component/zlib/buildout.cfg
../../component/icu/buildout.cfg
gowork.cfg
gowork.cfg
# for instance
# for instance
...
@@ -30,7 +29,7 @@ extends =
...
@@ -30,7 +29,7 @@ extends =
../../component/logrotate/buildout.cfg
../../component/logrotate/buildout.cfg
parts =
parts =
ruby2.
3
ruby2.
6
golang1.12
golang1.12
git
git
postgresql10
postgresql10
...
@@ -43,11 +42,9 @@ parts =
...
@@ -43,11 +42,9 @@ parts =
gowork
gowork
gitlab-workhorse
gitlab-workhorse
gitaly-build
gitaly-build
python-4gitlab
gitlab-shell/vendor
gitlab-shell/vendor
gitlab/vendor/bundle
gitlab/vendor/bundle
gitlab_npm
gitlab_npm
github-markup-patch
gitlab-backup
gitlab-backup
# for instance
# for instance
...
@@ -71,19 +68,36 @@ revision = 571d6514f7290e8faa9439c4b86aa2f6c87df261
...
@@ -71,19 +68,36 @@ revision = 571d6514f7290e8faa9439c4b86aa2f6c87df261
[yarn]
[yarn]
# need this version of Yarn
# need this version of Yarn
recipe = slapos.recipe.build:download-unpacked
recipe = slapos.recipe.build:download-unpacked
url = https://github.com/yarnpkg/yarn/releases/download/v1.
3.2/yarn-v1.3.2
.tar.gz
url = https://github.com/yarnpkg/yarn/releases/download/v1.
10.0/yarn-v1.10.0
.tar.gz
md5sum =
db82fa09c996e9318f2f1d2ab99228f9
md5sum =
c8ad5d2a2f02ba666e92189dae951575
############################
############################
# Software compilation #
# Software compilation #
############################
############################
# python with eggs, that will be used in gitlab
# python with eggs, that will be used in gitlab
# gitlab-markup call the command `python3 /path/to/commands/rest2html` which
# require docutils
# https://gitlab.com/gitlab-org/gitlab-markup/-/blob/master/lib/github/markups.rb
[python-4gitlab]
[python-4gitlab]
recipe = zc.recipe.egg
recipe = plone.recipe.command
interpreter = python2
location = ${buildout:parts-directory}/${:_buildout_section_name_}
eggs =
bin = ${:location}/bin
docutils
eggs =
docutils
python-path = ${:location}/lib/python${python3:version}/site-packages
command =
${python3:location}/bin/pip3 install ${:eggs} --prefix=${:location}
mkdir -p ${:bin}
cat <<EOF > ${:location}/bin/python3
#!/bin/sh
export PATH=${python3:location}/bin:\$PATH
export PYTHONPATH=${:python-path}
exec python3 "\$@"
EOF
chmod 700 ${:location}/bin/python3
stop-on-error = true
# rubygemsrecipe with fixed url and this way pinned rubygems version
# rubygemsrecipe with fixed url and this way pinned rubygems version
[rubygemsrecipe]
[rubygemsrecipe]
...
@@ -95,7 +109,7 @@ url = https://rubygems.org/rubygems/rubygems-3.1.2.zip
...
@@ -95,7 +109,7 @@ url = https://rubygems.org/rubygems/rubygems-3.1.2.zip
# - run gitlab services / jobs (via `bundle exec ...`)
# - run gitlab services / jobs (via `bundle exec ...`)
[bundler-4gitlab]
[bundler-4gitlab]
<= rubygemsrecipe
<= rubygemsrecipe
ruby-location = ${ruby2.
3
:location}
ruby-location = ${ruby2.
6
:location}
ruby-executable = ${:ruby-location}/bin/ruby
ruby-executable = ${:ruby-location}/bin/ruby
gems =
gems =
bundler==1.17.3
bundler==1.17.3
...
@@ -118,11 +132,11 @@ bundle1.17.3 = ${buildout:parts-directory}/${:_buildout_section_name_}/lib/ruby/
...
@@ -118,11 +132,11 @@ bundle1.17.3 = ${buildout:parts-directory}/${:_buildout_section_name_}/lib/ruby/
# gitlab wants git to be really on path ( it uses git from abspath defined in
# gitlab wants git to be really on path ( it uses git from abspath defined in
# gitlab.yml, but there are not all cases like this, e.g. in
# gitlab.yml, but there are not all cases like this, e.g. in
# https://gitlab.com/gitlab-org/gitlab_git/blob/2f0d3c1a/lib/gitlab_git/repository.rb#L259 )
# https://gitlab.com/gitlab-org/gitlab_git/blob/2f0d3c1a/lib/gitlab_git/repository.rb#L259 )
# gitlab (via github-markup) wants to convert rst -> html via running: python
2
(with docutils egg)
# gitlab (via github-markup) wants to convert rst -> html via running: python
3
(with docutils egg)
# (python-4gitlab puts interpreter into ${buildout:bin-directory})
#
======>
(python-4gitlab puts interpreter into ${buildout:bin-directory})
environment =
environment =
PATH = ${yarn:location}/bin:${:ruby-location}/bin:${cmake:location}/bin:${pkgconfig:location}/bin:${nodejs-8.12.0:location}/bin:${postgresql10:location}/bin:${redis28:location}/bin:${git:location}/bin:${buildout:bin-directory}:%(PATH)s
PATH = ${
python-4gitlab:bin}:${
yarn:location}/bin:${:ruby-location}/bin:${cmake:location}/bin:${pkgconfig:location}/bin:${nodejs-8.12.0:location}/bin:${postgresql10:location}/bin:${redis28:location}/bin:${git:location}/bin:${buildout:bin-directory}:%(PATH)s
# gitlab, gitlab-shell & gitlab-workhorse checked out as git repositories
# gitlab, gitlab-shell & gitlab-workhorse checked out as git repositories
...
@@ -134,44 +148,29 @@ git-executable = ${git:location}/bin/git
...
@@ -134,44 +148,29 @@ git-executable = ${git:location}/bin/git
[gitlab-repository]
[gitlab-repository]
<= git-repository
<= git-repository
repository = https://lab.nexedi.com/nexedi/gitlab-ce.git
repository = https://lab.nexedi.com/nexedi/gitlab-ce.git
#
9.5.10
+ NXD patches:
#
11.11.8
+ NXD patches:
revision = v
9.5.10-8-gc290e22a08cb
revision = v
11.11.8-7-g193b94c3e2
location = ${buildout:parts-directory}/gitlab
location = ${buildout:parts-directory}/gitlab
[gitlab-shell-repository]
[gitlab-shell-repository]
<= git-repository
<= git-repository
#repository = https://lab.nexedi.com/nexedi/gitlab-shell.git
repository = https://gitlab.com/gitlab-org/gitlab-shell.git
repository = https://gitlab.com/gitlab-org/gitlab-shell.git
# gitlab
9.5.10 wants gitlab-shell 5.6.1
# gitlab
11.11.8 wants gitlab-shell 9.1.0
revision = v
5.6.1-10-g1e587d3b7f
revision = v
9.1.0-0-g0e3052be56
location = ${buildout:parts-directory}/gitlab-shell
location = ${buildout:parts-directory}/gitlab-shell
[gitaly-repository]
[gitaly-repository]
<= git-repository
<= git-repository
repository = https://gitlab.com/gitlab-org/gitaly.git
repository = https://gitlab.com/gitlab-org/gitaly.git
#
for version v0.35.0 (gitlab 9.5.10
)
#
gitaly version v1.42.7 (gitlab 11.11.8
)
revision = v
0.35.0-0-gf99a57b19a
revision = v
1.42.7-0-ge47c816beb
location = ${buildout:parts-directory}/gitaly
location = ${buildout:parts-directory}/gitaly
[gitlab-workhorse-repository]
[gitlab-workhorse-repository]
<= git-repository
<= git-repository
repository = https://lab.nexedi.com/nexedi/gitlab-workhorse.git
repository = https://lab.nexedi.com/nexedi/gitlab-workhorse.git
revision = v3.0.0-8-g74793ad3cc
revision = v8.7.0-11-gfc590d3581
#revision = a2c07d3068717158ad710304a51062d7de24f37d
# Patch github markup to not call "python2 -S /path/to/rest2html" but only "python2 /path/to/rest2html"
# NOTE github-markup invokes it as `python2`, that's why we are naming it this way
# https://github.com/github/markup/blob/5393ae93/lib/github/markups.rb#L36
[github-markup-patch]
recipe = plone.recipe.command
command =
files=$(ls ${gitlab-repository:location}/vendor/bundle/ruby/*/gems/git*-markup-*/lib/github/markups.rb) || true
if [ ! -z "$files" ]; then
for file in $files; do
sed -i 's#python2 -S#python2#' $file
done
fi
update-command = ${:command}
stop-on-error = True
# build needed-by-gitlab gems via bundler
# build needed-by-gitlab gems via bundler
[gitlab/vendor/bundle]
[gitlab/vendor/bundle]
...
@@ -183,12 +182,13 @@ configure-command = cd ${:path} &&
...
@@ -183,12 +182,13 @@ configure-command = cd ${:path} &&
${:bundle} config --local build.charlock_holmes --with-icu-dir=${icu:location} &&
${:bundle} config --local build.charlock_holmes --with-icu-dir=${icu:location} &&
${:bundle} config --local build.pg --with-pg-config=${postgresql10:location}/bin/pg_config &&
${:bundle} config --local build.pg --with-pg-config=${postgresql10:location}/bin/pg_config &&
${:bundle} config --local build.re2 --with-re2-dir=${re2:location}
${:bundle} config --local build.re2 --with-re2-dir=${re2:location}
${:bundle} config set without 'development test mysql aws kerberos'
${:bundle} config set deployment 'true'
make-binary =
make-binary =
make-targets= cd ${:path} &&
make-targets= cd ${:path} && ${:bundle} install
${:bundle} install --deployment --without development test mysql aws kerberos
environment =
environment =
PKG_CONFIG_PATH=${openssl-1.0:location}/lib/pkgconfig:${re2:location}/lib/pkgconfig
PKG_CONFIG_PATH=${openssl-1.0:location}/lib/pkgconfig:${re2:location}/lib/pkgconfig
:${icu:location}/lib/pkgconfig
PATH=${pkgconfig:location}/bin:%(PATH)s
PATH=${pkgconfig:location}/bin:%(PATH)s
################## Google re2
################## Google re2
...
@@ -270,7 +270,7 @@ make-targets =
...
@@ -270,7 +270,7 @@ make-targets =
. ${gowork:env.sh} && make
. ${gowork:env.sh} && make
environment =
environment =
PKG_CONFIG_PATH=${openssl-1.0:location}/lib/pkgconfig:${icu:location}/lib/pkgconfig
PKG_CONFIG_PATH=${openssl-1.0:location}/lib/pkgconfig:${icu:location}/lib/pkgconfig
PATH=${pkgconfig:location}/bin:${ruby2.
3
:location}/bin:%(PATH)s
PATH=${pkgconfig:location}/bin:${ruby2.
6
:location}/bin:%(PATH)s
[xnice-repository]
[xnice-repository]
...
@@ -292,7 +292,11 @@ bundle = ${bundler-4gitlab:bundle}
...
@@ -292,7 +292,11 @@ bundle = ${bundler-4gitlab:bundle}
configure-command = true
configure-command = true
make-binary =
make-binary =
make-targets= cd ${:path} &&
make-targets= cd ${:path} &&
# Compile go binary
. ${gowork:env.sh} && bin/compile &&
${:bundle} install --deployment --without development test
${:bundle} install --deployment --without development test
environment =
PATH=${ruby2.6:location}/bin:%(PATH)s
###############################
###############################
...
...
software/gitlab/template/gitlab-shell-config.yml.in
View file @
33754657
...
@@ -24,7 +24,7 @@ http_settings:
...
@@ -24,7 +24,7 @@ http_settings:
# Give the canonicalized absolute pathname,
# Give the canonicalized absolute pathname,
# REPOS_PATH MUST NOT CONTAIN ANY SYMLINK!!!
# REPOS_PATH MUST NOT CONTAIN ANY SYMLINK!!!
# Check twice that none of the components is a symlink, including "/home".
# Check twice that none of the components is a symlink, including "/home".
#
repos_path: "{{ gitlab.repositories }}"
repos_path: "{{ gitlab.repositories }}"
# File used as authorized_keys for gitlab user
# File used as authorized_keys for gitlab user
# NOTE not used in slapos version (all access via https only)
# NOTE not used in slapos version (all access via https only)
...
...
software/gitlab/template/gitlab.yml.in
View file @
33754657
...
@@ -171,6 +171,16 @@ production: &base
...
@@ -171,6 +171,16 @@ production: &base
storage_path: <%= @lfs_storage_path %>
storage_path: <%= @lfs_storage_path %>
#}
#}
## Uploads
uploads:
# The location where uploads objects are stored (default: public/).
storage_path: "{{ gitlab.var }}"
# The location where uploads objects are stored (default: public/).
# storage_path: public/
# base_dir: uploads/-/system
object_store:
enabled: false
remote_directory: uploads # Bucket name
{# we do not support container registry
{# we do not support container registry
## Container Registry
## Container Registry
...
...
software/gitlab/template/template-gitlab-resiliency-restore.sh.in
View file @
33754657
...
@@ -29,6 +29,7 @@ gitlab_work="{{ gitlab_work_location }}"
...
@@ -29,6 +29,7 @@ gitlab_work="{{ gitlab_work_location }}"
promise_check="{{ promise_lab_location }}"
promise_check="{{ promise_lab_location }}"
unicorn_script="{{ unicorn_script }}"
unicorn_script="{{ unicorn_script }}"
sidekiq_script="{{ sidekiq_script }}"
sidekiq_script="{{ sidekiq_script }}"
var_location="{{ run_directory }}/.."
# export GIT_EXEC_PATH=$git_location/libexec/git-core/
# export GIT_EXEC_PATH=$git_location/libexec/git-core/
...
@@ -61,6 +62,12 @@ if [ -f "$postgres_pid_file" ]; then
...
@@ -61,6 +62,12 @@ if [ -f "$postgres_pid_file" ]; then
rm $postgres_pid_file
rm $postgres_pid_file
fi
fi
# cleanup /var/backup and old repositories folders,
# restoration will created them at every run
echo "Cleanup gitlab backup and old repositories folders..."
rm -rf $var_location/backup/*
rm -rf $var_location/repositories*
echo "Starting Postgres..."
echo "Starting Postgres..."
$postgres_executable &
$postgres_executable &
postgres_pid=$!
postgres_pid=$!
...
...
software/gitlab/template/unicorn.rb.in
View file @
33754657
...
@@ -20,8 +20,6 @@ timeout {{ cfg('unicorn_worker_timeout') }}
...
@@ -20,8 +20,6 @@ timeout {{ cfg('unicorn_worker_timeout') }}
# combine Ruby 2.0.0dev or REE with "preload_app true" for memory savings
# combine Ruby 2.0.0dev or REE with "preload_app true" for memory savings
# http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow
# http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow
preload_app true
preload_app true
GC.respond_to?(:copy_on_write_friendly=) and
GC.copy_on_write_friendly = true
# Enable this flag to have unicorn test client connections by writing the
# Enable this flag to have unicorn test client connections by writing the
...
@@ -32,6 +30,13 @@ GC.respond_to?(:copy_on_write_friendly=) and
...
@@ -32,6 +30,13 @@ GC.respond_to?(:copy_on_write_friendly=) and
# fast LAN.
# fast LAN.
check_client_connection false
check_client_connection false
require_relative '{{ gitlab_work.location }}/lib/gitlab/cluster/lifecycle_events'
before_exec do |server|
# Signal application hooks that we're about to restart
Gitlab::Cluster::LifecycleEvents.do_before_master_restart
end
# How many worker processes
# How many worker processes
worker_processes {{ cfg('unicorn_worker_processes') }}
worker_processes {{ cfg('unicorn_worker_processes') }}
...
@@ -41,11 +46,8 @@ worker_processes {{ cfg('unicorn_worker_processes') }}
...
@@ -41,11 +46,8 @@ worker_processes {{ cfg('unicorn_worker_processes') }}
# What to do before we fork a worker
# What to do before we fork a worker
before_fork do |server, worker|
before_fork do |server, worker|
# XXX why gitlab does not enable this?
# Signal application hooks that we're about to fork
# # the following is highly recomended for Rails + "preload_app true"
Gitlab::Cluster::LifecycleEvents.do_before_fork
# # as there's no need for the master process to hold a connection
# defined?(ActiveRecord::Base) and
# ActiveRecord::Base.connection.disconnect!
# The following is only recommended for memory/DB-constrained
# The following is only recommended for memory/DB-constrained
# installations. It is not needed if your system can house
# installations. It is not needed if your system can house
...
@@ -75,28 +77,16 @@ end
...
@@ -75,28 +77,16 @@ end
# What to do after we fork a worker
# What to do after we fork a worker
after_fork do |server, worker|
after_fork do |server, worker|
# Signal application hooks of worker start
Gitlab::Cluster::LifecycleEvents.do_worker_start
# per-process listener ports for debugging/admin/migrations
# per-process listener ports for debugging/admin/migrations
# addr = "127.0.0.1:#{9293 + worker.nr}"
# addr = "127.0.0.1:#{9293 + worker.nr}"
# server.listen(addr, :tries => -1, :delay => 5, :tcp_nopush => true)
# server.listen(addr, :tries => -1, :delay => 5, :tcp_nopush => true)
# XXX why gitlab does not enable this?
# # the following is *required* for Rails + "preload_app true",
# defined?(ActiveRecord::Base) and
# ActiveRecord::Base.establish_connection
# reset prometheus client, this will cause any opened metrics files to be closed
#defined?(::Prometheus::Client.reinitialize_on_pid_change) &&
# Prometheus::Client.reinitialize_on_pid_change
# if preload_app is true, then you may also want to check and
# restart any other shared sockets/descriptors such as Memcached,
# and Redis. TokyoCabinet file handles are safe to reuse
# between any number of forked children (assuming your kernel
# correctly implements pread()/pwrite() system calls)
end
end
# Where to drop a pidfile
# Where to drop a pidfile
pid '{{ directory.run }}/unicorn.pid'
pid '{{ directory.run }}/unicorn.pid'
...
...
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