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
Ekaterina
slapos
Commits
a5cf72ad
Commit
a5cf72ad
authored
Jun 18, 2020
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gitab: fixup when creating new empty instance
parent
8823e5db
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
7 deletions
+6
-7
software/gitlab/buildout.hash.cfg
software/gitlab/buildout.hash.cfg
+3
-3
software/gitlab/gitlab-unicorn-startup.in
software/gitlab/gitlab-unicorn-startup.in
+2
-3
software/gitlab/instance-gitlab-export.cfg.in
software/gitlab/instance-gitlab-export.cfg.in
+1
-0
software/gitlab/instance-gitlab-test.cfg.in
software/gitlab/instance-gitlab-test.cfg.in
+0
-1
No files found.
software/gitlab/buildout.hash.cfg
View file @
a5cf72ad
...
@@ -42,7 +42,7 @@ md5sum = 9920d10442604f5d8a736825f20ebd2a
...
@@ -42,7 +42,7 @@ 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 =
240957eac87e0b074589acd27d284e04
md5sum =
79310724640dcc385e627b33334f4877
[gitlab.yml.in]
[gitlab.yml.in]
_update_hash_filename_ = template/gitlab.yml.in
_update_hash_filename_ = template/gitlab.yml.in
...
@@ -58,11 +58,11 @@ md5sum = 1b96d49767f925afc53df6960614eebb
...
@@ -58,11 +58,11 @@ md5sum = 1b96d49767f925afc53df6960614eebb
[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
md5sum =
2af7dcf63f74e5edc53a3ff11fa4989b
md5sum =
6ba5b3157a4c89edf280e32e84db6ac2
[instance-gitlab-test.cfg.in]
[instance-gitlab-test.cfg.in]
_update_hash_filename_ = instance-gitlab-test.cfg.in
_update_hash_filename_ = instance-gitlab-test.cfg.in
md5sum =
a4ad76856db98e508af7e773d9ff78f9
md5sum =
60714fb4e6c869c41bd5e9fada1b6e40
[macrolib.cfg.in]
[macrolib.cfg.in]
_update_hash_filename_ = macrolib.cfg.in
_update_hash_filename_ = macrolib.cfg.in
...
...
software/gitlab/gitlab-unicorn-startup.in
View file @
a5cf72ad
...
@@ -35,11 +35,10 @@ while true; do
...
@@ -35,11 +35,10 @@ while true; do
done
done
echo "I: PostgreSQL ready." 1>&2
echo "I: PostgreSQL ready." 1>&2
# make sure pg_trgm extension is enabled for gitlab db
psql -c 'CREATE EXTENSION IF NOT EXISTS pg_trgm;' || die "pg_trgm setup failed"
if echo "$pgtables" | grep -q '^Did not find any relations' ; then
if echo "$pgtables" | grep -q '^Did not find any relations' ; then
$RAKE db:schema:load db:seed_fu || die "initial db setup failed"
#$RAKE db:schema:load db:seed_fu || die "initial db setup failed"
$RAKE gitlab:setup RAILS_ENV=production force=yes || die "initial db setup failed"
fi
fi
...
...
software/gitlab/instance-gitlab-export.cfg.in
View file @
a5cf72ad
...
@@ -53,6 +53,7 @@ input = inline: gitlab-shell-work*
...
@@ -53,6 +53,7 @@ input = inline: gitlab-shell-work*
etc/service/postgres-start
etc/service/postgres-start
srv/redis/**
srv/redis/**
srv/unicorn/unicorn.socket
srv/unicorn/unicorn.socket
.cache
output = ${directory:srv}/exporter.exclude
output = ${directory:srv}/exporter.exclude
[gitlab-resiliency-restore-script]
[gitlab-resiliency-restore-script]
...
...
software/gitlab/instance-gitlab-test.cfg.in
View file @
a5cf72ad
[buildout]
[buildout]
extends =
extends =
{{ instance_gitlab_cfg }}
{{ instance_gitlab_export_cfg }}
{{ instance_gitlab_export_cfg }}
parts +=
parts +=
...
...
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