Skip to content

[security] Sensitive type for gitlab_rails #487

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

Open
m8t wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[security] Sensitive type for gitlab_rails #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8fd37f0
[security] Sensitive type for gitlab_rails
Feb 16, 2026
efa1f99
Call unwrap through Puppet manifest
Feb 17, 2026
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
2 changes: 1 addition & 1 deletion REFERENCE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ Default value: `undef`

##### <a name="-gitlab--gitlab_rails"></a>`gitlab_rails`

Data type: `Optional[Hash]`
Data type: `Optional[Variant[Hash,Sensitive[Hash]]]`

Hash of 'gitlab_pages' config parameters.

Expand Down
2 changes: 1 addition & 1 deletion manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
Optional[Hash] $gitlab_ci = undef,
Optional[Hash] $gitlab_kas = undef,
Optional[Hash] $gitlab_pages = undef,
Optional[Hash] $gitlab_rails = undef,
Optional[Variant[Hash,Sensitive[Hash]]] $gitlab_rails = undef,
Optional[Hash] $gitlab_sshd = undef,
Optional[Hash] $grafana = undef,
Optional[Hash] $high_availability = undef,
Expand Down
1 change: 1 addition & 0 deletions manifests/omnibus_config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@
source => $source_config_file,
}
} else {
$gitlab_rails_unwrap = $gitlab_rails.unwrap
file { $config_file:
* => $config_file_attributes,
content => template('gitlab/gitlab.rb.erb');
Expand Down
6 changes: 3 additions & 3 deletions templates/gitlab.rb.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ roles <%= decorate(@roles) %>
git_data_dirs(<%= decorate(@git_data_dirs) %>)

<%- end -%>
<%- if @gitlab_rails -%>
<%- if @gitlab_rails_unwrap -%>

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

<%- @gitlab_rails.keys.sort.each do |k| -%>
gitlab_rails['<%= k -%>'] = <%= decorate(@gitlab_rails[k]) %>
<%- @gitlab_rails_unwrap.keys.sort.each do |k| -%>
gitlab_rails['<%= k -%>'] = <%= decorate(@gitlab_rails_unwrap[k]) %>
<%- end end -%>
<%- if @user -%>

Expand Down