From c816c60f5dddb083374d43330a2c7e5cebd4fb35 Mon Sep 17 00:00:00 2001 From: Ben Thomas Date: Tue, 17 Nov 2015 15:32:55 -0700 Subject: [PATCH 1/2] switched from using the RC creation block to the param, seems better than solution in #114 --- manifests/setup.pp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/manifests/setup.pp b/manifests/setup.pp index 65672d7..eddf34a 100644 --- a/manifests/setup.pp +++ b/manifests/setup.pp @@ -96,17 +96,7 @@ rbenv::install { $git_user: group => $git_group, home => $git_home, - } - - # By default, puppet-rbenv sets ~/.profile to load rbenv, which is - # read when bash is invoked as an interactive login shell, but we - # also need ~/.bashrc to load rbenv (which is read by interactive - # but non-login shells). This works, but may not be the best - # solution, please see issue #114 if you have a better solution. - file { "${git_home}/.bashrc": - ensure => link, - target => "${git_home}/.profile", - require => Rbenv::Install[$git_user], + rc => '.bashrc', } rbenv::compile { 'gitlab/ruby': From d9adfbcdfccf200dcdf16907e8e6792c2190c8a3 Mon Sep 17 00:00:00 2001 From: Ben Thomas Date: Tue, 17 Nov 2015 15:48:29 -0700 Subject: [PATCH 2/2] changed to array, dependent on pull request to rbenv --- manifests/setup.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/setup.pp b/manifests/setup.pp index eddf34a..b3a3bd1 100644 --- a/manifests/setup.pp +++ b/manifests/setup.pp @@ -96,7 +96,7 @@ rbenv::install { $git_user: group => $git_group, home => $git_home, - rc => '.bashrc', + rc => ['.bashrc','.profile'], } rbenv::compile { 'gitlab/ruby':