gitlab
/
omnibus-gitlab
mirror of https://gitlab.com/gitlab-org/omnibus-gitlab.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gitlab_shell_secret_from_template' into 'master' 

Gitlab shell secret symlinking

See merge request !400
This commit is contained in:
Marin Jankovski 2015-07-03 14:59:13 +00:00
parent f17ddb638b 95ce27c777
commit b34d4bcf4f
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config/templates/package-scripts/posttrans.erb Normal file
View File

@ -0,0 +1,14 @@
#!/bin/sh
# GitLab post-transition script
# RPM only
DEST_DIR=<%= install_dir %>
case "$1" in
0)
# RPM install/upgrade
ln -sf ${DEST_DIR}/embedded/service/gitlab-shell/.gitlab_shell_secret ${DEST_DIR}/embedded/service/gitlab-rails/.gitlab_shell_secret
;;
*)
# Noop.
;;
esac

6
files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
View File

@ -17,6 +17,7 @@
#
gitlab_rails_source_dir = "/opt/gitlab/embedded/service/gitlab-rails"
gitlab_shell_source_dir = "/opt/gitlab/embedded/service/gitlab-shell"
gitlab_rails_dir = node['gitlab']['gitlab-rails']['dir']
gitlab_rails_etc_dir = File.join(gitlab_rails_dir, "etc")
gitlab_rails_static_etc_dir = "/opt/gitlab/etc/gitlab-rails"
@ -28,9 +29,6 @@ ssh_dir = File.join(node['gitlab']['user']['home'], ".ssh")
known_hosts = File.join(ssh_dir, "known_hosts")
gitlab_app = "gitlab"
# Needed for .gitlab_shell_secret
gitlab_shell_var_dir = "/var/opt/gitlab/gitlab-shell"
[
gitlab_rails_etc_dir,
gitlab_rails_static_etc_dir,
@ -171,7 +169,7 @@ template_symlink File.join(gitlab_rails_etc_dir, "rack_attack.rb") do
end
link File.join(gitlab_rails_source_dir, ".gitlab_shell_secret") do
to File.join(gitlab_shell_var_dir, "gitlab_shell_secret")
to File.join(gitlab_shell_source_dir, ".gitlab_shell_secret")
end
directory node['gitlab']['gitlab-rails']['satellites_path'] do