v6.4.2

* Add a profile script shim, so init script can correct Ruby.

CHANGELOG.md

@@ -1,6 +1,11 @@
 Gitlab Cookbook Changelog
 =========================
 
+v6.4.2
+------
+
+* Add a profile script shim, so init script can correct Ruby.
+
 v6.4.1
 ------
 

metadata.rb

@@ -4,7 +4,7 @@
 description      'Installs/Configures gitlab'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
 name             'gitlab'
-version          '6.4.1'
+version          '6.4.2'
 
 %w[build-essential zlib readline ncurses git openssh redisio xml
    ruby_build certificate database logrotate mysql nginx

recipes/default.rb

@@ -155,6 +155,14 @@
   group node['gitlab']['group']
 end
 
+# Drop off a profile script to be included in init script
+template "#{node['gitlab']['home']}/.profile" do
+  source 'profile_gitlab.sh.erb'
+  owner node['gitlab']['user']
+  group node['gitlab']['group']
+  mode '0755'
+end
+
 # Render gitlab init script
 # This needs to happen before gitlab.yml is rendered.
 # So when the service is subscribed, the init file will be in place

templates/default/gitlab.init.erb

@@ -39,6 +39,9 @@ sidekiq_pid_path="$pid_path/sidekiq.pid"
 # Read configuration variable file if it is present
 test -f /etc/default/gitlab && . /etc/default/gitlab
 
+# Read profile script if it is present
+test -x <%= node['gitlab']['home'] %>/.profile && . <%= node['gitlab']['home'] %>/.profile
+
 # Switch to the app_user if it is not he/she who is running the script.
 if [ "$USER" != "$app_user" ]; then
   sudo -u "$app_user" -H -i $0 "$@"; exit;

templates/default/profile_gitlab.sh.erb

@@ -0,0 +1,7 @@
+#!/bin/bash
+# Generated by Chef for <%= @fqdn %>
+# Local modifications will be overwritten.
+RUBY_DIR=<%= node['gitlab']['install_ruby_path'] %>
+if ! echo ${PATH} | /bin/grep -q $RUBY_DIR/bin ; then
+   PATH=$RUBY_DIR/bin:${PATH}
+fi