Skip to content
Snippets Groups Projects
Commit 1aea102d authored by Balasankar "Balu" C's avatar Balasankar "Balu" C
Browse files

Move manage_accounts settings to underscored form

parent 7231f9d2
No related branches found
No related tags found
No related merge requests found
Showing
with 14 additions and 12 deletions
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
groupname account_helper.consul_group groupname account_helper.consul_group
gid node['consul']['gid'] gid node['consul']['gid']
home node['consul']['dir'] home node['consul']['dir']
manage node['gitlab']['manage-accounts']['enable'] manage node['gitlab']['manage_accounts']['enable']
end end
directory node['consul']['dir'] do directory node['consul']['dir'] do
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
gid node['redis']['gid'] gid node['redis']['gid']
shell node['redis']['shell'] shell node['redis']['shell']
home node['redis']['home'] home node['redis']['home']
manage node['gitlab']['manage-accounts']['enable'] manage node['gitlab']['manage_accounts']['enable']
end end
directory new_resource.sentinel_configuration['dir'] do directory new_resource.sentinel_configuration['dir'] do
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#### ####
default['gitlab']['bootstrap']['enable'] = true default['gitlab']['bootstrap']['enable'] = true
# Create users and groups needed for the package # Create users and groups needed for the package
default['gitlab']['manage-accounts']['enable'] = true default['gitlab']['manage_accounts']['enable'] = true
# Create directories with correct permissions and ownership required by the pkg # Create directories with correct permissions and ownership required by the pkg
default['gitlab']['manage-storage-directories']['enable'] = true default['gitlab']['manage-storage-directories']['enable'] = true
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
account username do account username do
username username username username
action :remove action :remove
manage node['gitlab']['manage-accounts']['enable'] manage node['gitlab']['manage_accounts']['enable']
end end
end end
...@@ -35,6 +35,6 @@ ...@@ -35,6 +35,6 @@
account group do account group do
groupname group groupname group
action :remove action :remove
manage node['gitlab']['manage-accounts']['enable'] manage node['gitlab']['manage_accounts']['enable']
end end
end end
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
gid node['gitlab']['user']['gid'] gid node['gitlab']['user']['gid']
shell node['gitlab']['user']['shell'] shell node['gitlab']['user']['shell']
home gitlab_home home gitlab_home
manage node['gitlab']['manage-accounts']['enable'] manage node['gitlab']['manage_accounts']['enable']
end end
# Configure Git settings for the GitLab user # Configure Git settings for the GitLab user
......
...@@ -35,5 +35,5 @@ ...@@ -35,5 +35,5 @@
append_to_group external_webserver_users.any? append_to_group external_webserver_users.any?
group_members external_webserver_users group_members external_webserver_users
manage_home false manage_home false
manage node['gitlab']['manage-accounts']['enable'] manage node['gitlab']['manage_accounts']['enable']
end end
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
gid mattermost_gid gid mattermost_gid
shell '/bin/sh' shell '/bin/sh'
home mattermost_home home mattermost_home
manage node['gitlab']['manage-accounts']['enable'] manage node['gitlab']['manage_accounts']['enable']
end end
### ###
......
...@@ -27,5 +27,5 @@ ...@@ -27,5 +27,5 @@
home prometheus_dir home prometheus_dir
gid node['monitoring']['prometheus']['gid'] gid node['monitoring']['prometheus']['gid']
shell node['monitoring']['prometheus']['shell'] shell node['monitoring']['prometheus']['shell']
manage node['gitlab']['manage-accounts']['enable'] manage node['gitlab']['manage_accounts']['enable']
end end
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
registry_external_url registry_external_url
gitlab_ci gitlab_ci
high_availability high_availability
manage_accounts
].freeze ].freeze
def self.extended(base) def self.extended(base)
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
gid node['postgresql']['gid'] gid node['postgresql']['gid']
shell node['postgresql']['shell'] shell node['postgresql']['shell']
home node['postgresql']['home'] home node['postgresql']['home']
manage node['gitlab']['manage-accounts']['enable'] manage node['gitlab']['manage_accounts']['enable']
end end
directory node['postgresql']['home'] do directory node['postgresql']['home'] do
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
gid node['redis']['gid'] gid node['redis']['gid']
shell node['redis']['shell'] shell node['redis']['shell']
home node['redis']['home'] home node['redis']['home']
manage node['gitlab']['manage-accounts']['enable'] manage node['gitlab']['manage_accounts']['enable']
end end
group 'Socket group' do group 'Socket group' do
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
gid registry_gid gid registry_gid
shell '/bin/sh' shell '/bin/sh'
home working_dir home working_dir
manage node['gitlab']['manage-accounts']['enable'] manage node['gitlab']['manage_accounts']['enable']
end end
directory "create #{working_dir} and set the owner" do directory "create #{working_dir} and set the owner" do
......
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
%w[registry-external-url registry_external_url], %w[registry-external-url registry_external_url],
%w[gitlab-ci gitlab_ci], %w[gitlab-ci gitlab_ci],
%w[high-availability high_availability], %w[high-availability high_availability],
%w[manage-accounts manage_accounts],
].each do |input, output| ].each do |input, output|
expect(subject.sanitized_key(input)).to eq(output) expect(subject.sanitized_key(input)).to eq(output)
end end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment