Download as
Browse Code »

Commit db96c5be889010c8c459762c141adc746d4c617d

Authored by Jacob Vosmaer
2 parents 3bc9cb58 ef828120
Exists in master and in 17 other branches 6-6-stable, 6-6-stable-ee, 6-7-stable, 6-7-stable-ee, 6-8-stable, 6-8-stable-ee, 6-9-stable, 6-9-stable-ee, 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test, nginx_ssl_tweaks

Merge branch 'gitlab_core_wrappers' into 'master' 

Gitlab Core Wrappers
Showing 2 changed files with 21 additions and 16 deletions   Show diff stats
config/software/gitlab-core.rb
  Diff comments   View file @db96c5b
... ... @@ -61,21 +61,14 @@ build do
61 61 command "#{install_dir}/embedded/bin/rsync -a --delete --exclude=.git/*** --exclude=.gitignore ./ #{install_dir}/embedded/service/gitlab-core/"
62 62  
63 63 # Create a wrapper for the rake tasks of the Rails app
64   - block do
65   - open("#{install_dir}/bin/gitlab-rake", "w") do |file|
66   - file.print <<-EOH
67   -#!/bin/bash
68   -export PATH=/opt/gitlab/bin:/opt/gitlab/embedded/bin:$PATH
  64 + erb :dest => "#{install_dir}/bin/gitlab-rake",
  65 + :source => "bundle_exec_wrapper.erb",
  66 + :mode => 0755,
  67 + :vars => {:command => 'rake "$@"', :install_dir => install_dir}
69 68  
70   -# default to RAILS_ENV=production
71   -if [[ -z $RAILS_ENV ]]; then
72   - export RAILS_ENV=production
73   -fi
74   -
75   -cd /opt/gitlab/embedded/service/gitlab-core
76   -/opt/gitlab/embedded/bin/chpst -u git -U git /opt/gitlab/embedded/bin/bundle exec rake "$@"
77   -EOH
78   - end
79   - end
80   - command "chmod +x #{install_dir}/bin/gitlab-rake"
  69 + # Create a wrapper for the rails command, useful for e.g. `rails console`
  70 + erb :dest => "#{install_dir}/bin/gitlab-rails",
  71 + :source => "bundle_exec_wrapper.erb",
  72 + :mode => 0755,
  73 + :vars => {:command => 'rails "$@"', :install_dir => install_dir}
81 74 end
... ...
config/templates/gitlab-core/bundle_exec_wrapper.erb 0 → 100644
  Diff comments   View file @db96c5b
... ... @@ -0,0 +1,12 @@
  1 +#!/bin/bash
  2 +export PATH=<%= install_dir %>/bin:<%= install_dir %>/embedded/bin:$PATH
  3 +
  4 +# default to RAILS_ENV=production
  5 +if [[ -z $RAILS_ENV ]]; then
  6 + export RAILS_ENV=production
  7 +fi
  8 +
  9 +gitlab_user=$(ls -lLd <%= install_dir %>/embedded/service/gitlab-core/log | awk '{ print $3 }')
  10 +
  11 +cd <%= install_dir %>/embedded/service/gitlab-core
  12 +exec <%= install_dir %>/embedded/bin/chpst -u $gitlab_user -U $gitlab_user <%= install_dir %>/embedded/bin/bundle exec <%= command %>
... ...