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
e568037f
Commit
e568037f
authored
Nov 11, 2015
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
X on reinstantiate run asset:precompile & friends
parent
b8d35c8d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
34 additions
and
3 deletions
+34
-3
software/gitlab/instance-gitlab.cfg.in
software/gitlab/instance-gitlab.cfg.in
+34
-3
No files found.
software/gitlab/instance-gitlab.cfg.in
View file @
e568037f
...
...
@@ -30,6 +30,8 @@ parts =
service-postgresql
service-redis
# instance-setup-firsttime
instance-upgrade
# std stuff for slapos instance
eggs-directory = {{ eggs_directory }}
...
...
@@ -129,7 +131,7 @@ log = ${gitlab-shell-dir:log}
secret = ${secrets:secrets}/gitlab_shell_secret
# place to keep all secrets
[secrets]
recipe = slapos.cookbook:mkdirectory
secrets = ${directory:srv}/secrets
...
...
@@ -283,6 +285,7 @@ prog = {{ prog }}
# XXX naming
# XXX better do such tricks with bind mounting, but that requires user namespaces
# TODO root-shadow -> work
[root-shadow]
recipe = plone.recipe.command
stop-on-error = yes
...
...
@@ -301,7 +304,6 @@ update-command =
${:tune-command}
# XXX store
# NOTE there is no need to link/create .gitlab_shell_secret - we set path to it
# in gitlab & gitlab-shell configs, and gitlab creates it on its first start
[gitlab-root-shadow]
...
...
@@ -392,6 +394,7 @@ port =
[redis]
recipe = slapos.cookbook:mkdirectory
srv = ${directory:srv}/redis
log = ${directory:log}/redis
[service-redis]
...
...
@@ -401,7 +404,7 @@ server_bin = {{ redis_bin }}/redis-server
server_dir = ${redis:srv}
config_file = ${directory:etc}/redis.conf
log_file = ${
directory
:log}/redis.log
log_file = ${
redis
:log}/redis.log
pid_file = ${directory:run}/redis.pid
use_passwd = false
...
...
@@ -526,3 +529,31 @@ recipe = slapos.cookbook:wrapper
wrapper-path = ${directory:service}/nginx
command-line = {{ nginx_bin }} -p ${nginx:srv} -c ${nginx.conf:rendered}
depend = ${nginx-symlinks:symlink}
# 5. instance setup / upgrade
# TODO
#[instance-setup-firsttime]
# what to do when instance is upgraded
# 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/gitlab/upgrader.rb
# TODO omnibus -> files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb ?
[upgrade-dir]
recipe = slapos.cookbook:mkdirectory
log = ${directory:log}/upgrade
# XXX run db:migrate only if version changed ?
[instance-upgrade]
recipe = plone.recipe.command
stop-on-error = true
rake = ${gitlab-rake:wrapper-path}
command =
${:rake} db:migrate 2>&1 | tee ${upgrade-dir:log}/db-mirate-`date +%s`.log &&
${:rake} assets:clean &&
${:rake} assets:precompile &&
${:rake} cache:clear &&
true
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