Skip to content

some people have strange PATHs, let's respect that #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 7, 2013
Merged

some people have strange PATHs, let's respect that #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ See [gitlab example](https://github.com/sbadia/vagrant-gitlab/blob/master/exampl
* `gitlab_projects`: GitLab default number of projects for new users (default: 10)
* `gitlab_username_change`: Manage username changing in GitLab (default: true)
* `gitlab_unicorn_port`: Port that unicorn listens on 172.0.0.1 for HTTP traffic (default: 8080)
* `exec_path`: PATH of executtion (default: `/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin`)
* `ldap_enabled`: Enable LDAP backend for gitlab web (see bellow) (default: false)
* `ldap_host`: FQDN of LDAP server (default: ldap.domain.com)
* `ldap_base`: LDAP base dn (default: dc=domain,dc=com)
Expand Down
1 change: 1 addition & 0 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@
$gitlab_projects = $gitlab::params::gitlab_projects,
$gitlab_username_change = $gitlab::params::gitlab_username_change,
$gitlab_unicorn_port = $gitlab::params::gitlab_unicorn_port,
$exec_path = $gitlab::params::exec_path,
$ldap_enabled = $gitlab::params::ldap_enabled,
$ldap_host = $gitlab::params::ldap_host,
$ldap_base = $gitlab::params::ldap_base,
Expand Down
2 changes: 1 addition & 1 deletion manifests/install.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

Exec {
user => $git_user,
path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
path => $exec_path,
}

File {
Expand Down
1 change: 1 addition & 0 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
$gitlab_projects = '10'
$gitlab_username_change = true
$gitlab_unicorn_port = '8080'
$exec_path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
$ldap_enabled = false
$ldap_host = 'ldap.domain.com'
$ldap_base = 'dc=domain,dc=com'
Expand Down
9 changes: 5 additions & 4 deletions spec/classes/gitlab_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
:gitlab_projects => '42',
:gitlab_username_change => false,
:gitlab_unicorn_port => '8888',
:exec_path => '/opt/bw/bin:/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin',
:ldap_host => 'ldap.fooboozoo.fr',
:ldap_base => 'dc=fooboozoo,dc=fr',
:ldap_port => '666',
Expand Down Expand Up @@ -383,7 +384,7 @@
it { should contain_file("#{params_set[:git_home]}/gitlab-shell/config.yml").with_content(/port: #{params_set[:gitlab_redisport]}/)}
it { should contain_exec('install gitlab-shell').with(
:user => params_set[:git_user],
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:path => params_set[:exec_path],
:command => "ruby #{params_set[:git_home]}/gitlab-shell/bin/install",
:cwd => params_set[:git_home],
:creates => "#{params_set[:gitlab_repodir]}/repositories",
Expand Down Expand Up @@ -472,7 +473,7 @@
describe 'install gitlab' do
it { should contain_exec('install gitlab').with(
:user => params_set[:git_user],
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:path => params_set[:exec_path],
:command => 'bundle install --without development aws test postgres --deployment',
:cwd => "#{params_set[:git_home]}/gitlab",
:creates => "#{params_set[:git_home]}/.git_setup_done",
Expand All @@ -492,7 +493,7 @@
let(:params) { params_set.merge({ :gitlab_dbtype => 'pgsql' }) }
it { should contain_exec('install gitlab').with(
:user => params_set[:git_user],
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:path => params_set[:exec_path],
:command => 'bundle install --without development aws test mysql --deployment',
:cwd => "#{params_set[:git_home]}/gitlab",
:creates => "#{params_set[:git_home]}/.git_setup_done",
Expand All @@ -507,7 +508,7 @@
describe 'setup gitlab database' do
it { should contain_exec('setup gitlab database').with(
:user => params_set[:git_user],
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:path => params_set[:exec_path],
:command => '/usr/bin/yes yes | bundle exec rake gitlab:setup RAILS_ENV=production',
:cwd => "#{params_set[:git_home]}/gitlab",
:creates => "#{params_set[:git_home]}/.gitlab_setup_done",
Expand Down