Merge branch 'gitlab-www-home' into 'master'

Decouple gitlab-www home directory from NGINX

There is no reason for the home directory of gitlab-www to be the NGINX
'root' directory. Adding this distinction makes live easier on systems
where home directories cannot be moved easily.

See merge request !318

files/gitlab-config-template/gitlab.rb.template

@@ -323,6 +323,8 @@ external_url 'GENERATED_EXTERNAL_URL'
 # web_server['group'] = 'gitlab-www'
 # web_server['uid'] = nil
 # web_server['gid'] = nil
+# web_server['shell'] = '/bin/false'
+# web_server['home'] = '/var/opt/gitlab/nginx'
 
 
 ################

files/gitlab-cookbooks/gitlab/attributes/default.rb

@@ -266,6 +266,7 @@ default['gitlab']['web-server']['group'] = 'gitlab-www'
 default['gitlab']['web-server']['uid'] = nil
 default['gitlab']['web-server']['gid'] = nil
 default['gitlab']['web-server']['shell'] = '/bin/false'
+default['gitlab']['web-server']['home'] = '/var/opt/gitlab/nginx'
 # When bundled nginx is disabled we need to add the external webserver user to the GitLab webserver group
 default['gitlab']['web-server']['external_users'] = []
 

files/gitlab-cookbooks/gitlab/recipes/web-server.rb

@@ -34,7 +34,7 @@ end
 # Create the webserver user
 user webserver_username do
   shell node['gitlab']['web-server']['shell']
-  home node['gitlab']['nginx']['dir']
+  home node['gitlab']['web-server']['home']
   uid node['gitlab']['web-server']['uid']
   gid webserver_group
   system true