Using rbenv instead of system ruby #114
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,16 @@ | ||
| fixtures: | ||
| symlinks: | ||
| gitlab: "#{source_dir}" | ||
| repositories: | ||
| git: | ||
| repo: "git://github.com/puppetlabs/puppetlabs-git.git" | ||
| ref: "0.0.3" | ||
| rbenv: | ||
| repo: "git://github.com/alup/puppet-rbenv.git" | ||
| ref: "6628a24" | ||
| stdlib: | ||
| repo: "git://github.com/puppetlabs/puppetlabs-stdlib.git" | ||
| ref: "4.2.1" | ||
| vcsrepo: | ||
| repo: "git://github.com/puppetlabs/puppetlabs-vcsrepo.git" | ||
| ref: "0.2.0" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -77,18 +77,40 @@ | |
| } | ||
| } # Case $::osfamily | ||
|
|
||
| # dev. dependencies | ||
| ensure_packages($system_packages) | ||
|
|
||
| rbenv::install { $git_user: | ||
| group => $git_user, | ||
| 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], | ||
| } | ||
|
|
||
| rbenv::compile { 'gitlab/ruby': | ||
| user => $git_user, | ||
| home => $git_home, | ||
| ruby => $gitlab_ruby_version, | ||
| global => true, | ||
| notify => [ Exec['install gitlab-shell'], | ||
| Exec['install gitlab'] ], | ||
|
Collaborator
There was a problem hiding this comment. i'd write this as notify => [
Exec['install gitlab-shell'],
Exec['install gitlab'],
],
Collaborator
There was a problem hiding this comment. (There's no definite word on that in the puppet style guide so… |
||
| } | ||
|
|
||
| rbenv::gem { 'charlock_holmes': | ||
| ensure => '0.6.9.4', | ||
|
Collaborator
There was a problem hiding this comment. we should put this into a variable somewhere. Another time. |
||
| user => $git_user, | ||
| home => $git_home, | ||
| ruby => $gitlab_ruby_version, | ||
| } | ||
|
|
||
| # other packages | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,11 +13,12 @@ | |
| # a non-default common parameter set | ||
| let :params_set do | ||
| { | ||
| :git_user => 'gitlab', | ||
| :git_home => '/srv/gitlab', | ||
| :git_comment => 'Labfooboozoo', | ||
| :git_email => '[email protected]', | ||
| :git_proxy => 'http://proxy.fooboozoo.fr:3128', | ||
| :gitlab_ruby_version => '2.0.0' | ||
| } | ||
| end | ||
|
|
||
|
|
@@ -41,7 +42,7 @@ | |
| it { should contain_file('/home/git').with(:ensure => 'directory', :mode => '0755')} | ||
| it { should contain_file('/home/git/gitlab-satellites').with(:ensure => 'directory', :mode => '0750')} | ||
| end | ||
| context 'with specific params' do | ||
| let(:params) { params_set } | ||
| it { should contain_user(params_set[:git_user]).with( | ||
| :ensure => 'present', | ||
|
|
@@ -59,8 +60,50 @@ | |
| end | ||
| end | ||
|
|
||
| ### Ruby | ||
| describe 'rbenv' do | ||
| context 'with default params' do | ||
| it { should contain_rbenv__install('git').with( | ||
| :group => 'git', | ||
| :home => '/home/git' | ||
| )} | ||
| it { should contain_file('/home/git/.bashrc').with( | ||
| :ensure => 'link', | ||
| :target => '/home/git/.profile', | ||
| :require => 'Rbenv::Install[git]' | ||
| )} | ||
| it { should contain_rbenv__compile('gitlab/ruby').with( | ||
| :user => 'git', | ||
| :home => '/home/git', | ||
| :ruby => '2.1.2', | ||
| :global => true, | ||
| :notify => ['Exec[install gitlab-shell]', 'Exec[install gitlab]'] | ||
| )} | ||
|
|
||
| end | ||
| context 'with specific params' do | ||
| let(:params) { params_set } | ||
| it { should contain_rbenv__install(params_set[:git_user]).with( | ||
| :group => params_set[:git_user], | ||
| :home => params_set[:git_home] | ||
| )} | ||
| it { should contain_file('/srv/gitlab/.bashrc').with( | ||
| :ensure => 'link', | ||
| :target => '/srv/gitlab/.profile', | ||
| :require => 'Rbenv::Install[gitlab]' | ||
| )} | ||
| it { should contain_rbenv__compile('gitlab/ruby').with( | ||
| :user => params_set[:git_user], | ||
| :home => params_set[:git_home], | ||
| :ruby => '2.0.0', | ||
| :global => true, | ||
| :notify => ['Exec[install gitlab-shell]', 'Exec[install gitlab]'] | ||
| )} | ||
| end | ||
| end | ||
|
|
||
| ### Sshkey | ||
| describe 'sshkey (hostfile)' do | ||
| it { should contain_sshkey('localhost').with( | ||
| :ensure => 'present', | ||
| :host_aliases => 'gitlab.fooboozoo.fr', | ||
|
|
@@ -118,13 +161,8 @@ | |
| end | ||
| #### Gems (all dist.) | ||
| describe 'commons gems' do | ||
| it { should contain_rbenv__gem('charlock_holmes').with( | ||
| :ensure => '0.6.9.4' | ||
| )} | ||
| end | ||
| #### Commons packages (all dist.) | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please remove this space