Create the user for GitLab

Jacob Vosmaer
1 parent d15a8456
Showing 3 changed files with 21 additions and 8 deletions Show diff stats
files/gitlab-cookbooks/gitlab/attributes/default.rb
files/gitlab-cookbooks/gitlab/recipes/default.rb
files/gitlab-cookbooks/gitlab/recipes/users.rb
@@ -17,6 +17,17 @@
  
 default['gitlab']['bootstrap']['enable'] = true
  
+####
+# The Git User that services run as
+####
+# The username for the chef services user
+default['gitlab']['user']['username'] = "git"
+# The shell for the chef services user
+default['gitlab']['user']['shell'] = "/bin/sh"
+# The home directory for the chef services user
+default['gitlab']['user']['home'] = "/var/opt/gitlab"
+
+
 ###
 # PostgreSQL
 ###
@@ -44,6 +44,8 @@ directory &quot;/var/opt/gitlab&quot; do
   action :create
 end
  
+include_recipe "gitlab::users"
+
 # Install our runit instance
 include_recipe "runit"
  
@@ -15,13 +15,13 @@
 # limitations under the License.
 #
  
-# Create a user for Chef services to run as
-user node['chef_server']['user']['username'] do
-  system true
-  shell node['chef_server']['user']['shell']
-  home node['chef_server']['user']['home']
-end
+gitlab_username = node['gitlab']['user']['username']
  
-group node['chef_server']['user']['username'] do
-  members [node['chef_server']['user']['username']]
+group gitlab_username
+
+# Create a user for Chef services to run as
+user gitlab_username do
+  shell node['gitlab']['user']['shell']
+  home node['gitlab']['user']['home']
+  gid gitlab_username
 end
...	...	@@ -17,6 +17,17 @@
17	17
18	18	default['gitlab']['bootstrap']['enable'] = true
19	19
	20	+####
	21	+# The Git User that services run as
	22	+####
	23	+# The username for the chef services user
	24	+default['gitlab']['user']['username'] = "git"
	25	+# The shell for the chef services user
	26	+default['gitlab']['user']['shell'] = "/bin/sh"
	27	+# The home directory for the chef services user
	28	+default['gitlab']['user']['home'] = "/var/opt/gitlab"
	29	+
	30	+
20	31	###
21	32	# PostgreSQL
22	33	###
...	...
...	...	@@ -44,6 +44,8 @@ directory "/var/opt/gitlab" do
44	44	action :create
45	45	end
46	46
	47	+include_recipe "gitlab::users"
	48	+
47	49	# Install our runit instance
48	50	include_recipe "runit"
49	51
...	...
...	...	@@ -15,13 +15,13 @@
15	15	# limitations under the License.
16	16	#
17	17
18		-# Create a user for Chef services to run as
19		-user node['chef_server']['user']['username'] do
20		- system true
21		- shell node['chef_server']['user']['shell']
22		- home node['chef_server']['user']['home']
23		-end
	18	+gitlab_username = node['gitlab']['user']['username']
24	19
25		-group node['chef_server']['user']['username'] do
26		- members [node['chef_server']['user']['username']]
	20	+group gitlab_username
	21	+
	22	+# Create a user for Chef services to run as
	23	+user gitlab_username do
	24	+ shell node['gitlab']['user']['shell']
	25	+ home node['gitlab']['user']['home']
	26	+ gid gitlab_username
27	27	end
...	...