Skip to content

Commit

Permalink
Merge pull request #5 from tdb/gitlab_rails
Browse files Browse the repository at this point in the history
Remove rails; it's a duplicate of gitlab_rails.
  • Loading branch information
tobru committed Jun 23, 2015
2 parents df4ca49 + 0d79328 commit e7d0191
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 9 deletions.
1 change: 0 additions & 1 deletion manifests/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
$logrotate = $::gitlab::logrotate
$nginx = $::gitlab::nginx
$postgresql = $::gitlab::postgresql
$rails = $::gitlab::rails
$redis = $::gitlab::redis
$shell = $::gitlab::shell
$sidekiq = $::gitlab::sidekiq
Expand Down
6 changes: 0 additions & 6 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,6 @@
# Default: undef
# Hash of 'postgresql' config parameters.
#
# [*rails*]
# Default: undef
# Hash of 'gitlab_rails' config parameters.
#
# [*redis*]
# Default: undef
# Hash of 'redis' config parameters.
Expand Down Expand Up @@ -178,7 +174,6 @@
$logrotate = undef,
$nginx = undef,
$postgresql = undef,
$rails = undef,
$redis = undef,
$shell = undef,
$sidekiq = undef,
Expand Down Expand Up @@ -219,7 +214,6 @@
if $logrotate { validate_hash($logrotate) }
if $nginx { validate_hash($nginx) }
if $postgresql { validate_hash($postgresql) }
if $rails { validate_hash($rails) }
if $redis { validate_hash($redis) }
if $shell { validate_hash($shell) }
if $sidekiq { validate_hash($sidekiq) }
Expand Down
4 changes: 2 additions & 2 deletions templates/gitlab.rb.erb
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ external_url '<%= @external_url %>'
## If you want to use a single non-default directory to store git data use:
git_data_dir "<%= git_data_dir %>"
<%- end -%>
<%- if @rails -%>
<%- if @gitlab_rails -%>

############################
# gitlab.yml configuration #
############################

<%- @rails.each do |k,v| -%>
<%- @gitlab_rails.each do |k,v| -%>
gitlab_rails['<%= k -%>'] = <%= decorate(v) %>
<%- end end -%>
<%- if @user -%>
Expand Down

0 comments on commit e7d0191

Please sign in to comment.