diff --git a/doc/settings/configuration.md b/doc/settings/configuration.md index aa3779b68fb52c19b57e90a0709dc31d8a0053c6_ZG9jL3NldHRpbmdzL2NvbmZpZ3VyYXRpb24ubWQ=..98f4185cff6b1808401b70cd9a486a58270c9343_ZG9jL3NldHRpbmdzL2NvbmZpZ3VyYXRpb24ubWQ= 100644 --- a/doc/settings/configuration.md +++ b/doc/settings/configuration.md @@ -111,6 +111,6 @@ ```bash -# GitLab user +# GitLab user (required) git @@ -115,5 +115,5 @@ git -# Web server user +# Web server user (required) gitlab-www @@ -118,5 +118,5 @@ gitlab-www -# Redis user for GitLab or GitLab CI +# Redis user for GitLab or GitLab CI (only when using packaged Redis) gitlab-redis @@ -121,5 +121,5 @@ gitlab-redis -# Postgresql user +# Postgresql user (only when using packaged Postgresql) gitlab-psql @@ -124,5 +124,5 @@ gitlab-psql -# GitLab CI user +# GitLab CI user (only when using GitLab CI) gitlab-ci @@ -127,9 +127,9 @@ gitlab-ci -# GitLab Mattermost user +# GitLab Mattermost user (only when using GitLab Mattermost) mattermost ``` By default, omnibus-gitlab package expects that following groups exist: ```bash @@ -130,9 +130,9 @@ mattermost ``` By default, omnibus-gitlab package expects that following groups exist: ```bash -# GitLab group +# GitLab group (required) git @@ -137,5 +137,5 @@ git -# Web server gropu +# Web server group (required) gitlab-www @@ -140,5 +140,5 @@ gitlab-www -# Redis group for GitLab or GitLab CI +# Redis group for GitLab or GitLab CI (only when using packaged Redis) gitlab-redis @@ -143,5 +143,5 @@ gitlab-redis -# Postgresql group +# Postgresql group (only when using packaged Postgresql) gitlab-psql @@ -146,5 +146,5 @@ gitlab-psql -# GitLab CI group +# GitLab CI group (only when using GitLab CI) gitlab-ci @@ -149,6 +149,6 @@ gitlab-ci -# GitLab Mattermost group +# GitLab Mattermost group (only when using GitLab Mattermost) mattermost ``` @@ -164,19 +164,9 @@ user['shell'] = "/bin/sh" user['home'] = "/var/opt/custom-gitlab" -# Postgresql -postgresql['username'] = "postgres-gitlab" -postgresql['shell'] = "/bin/sh" -postgresql['home'] = "/var/opt/postgres-gitlab" - -# Redis -redis['username'] = "redis-gitlab" -redis['shell'] = "/bin/false" -redis['home'] = "/var/opt/redis-gitlab" - # Web server web_server['username'] = 'webserver-gitlab' web_server['group'] = 'webserver-gitlab' web_server['shell'] = '/bin/false' web_server['home'] = '/var/opt/gitlab/webserver' @@ -177,9 +167,18 @@ # Web server web_server['username'] = 'webserver-gitlab' web_server['group'] = 'webserver-gitlab' web_server['shell'] = '/bin/false' web_server['home'] = '/var/opt/gitlab/webserver' +# Postgresql (not needed when using external Postgresql) +postgresql['username'] = "postgres-gitlab" +postgresql['shell'] = "/bin/sh" +postgresql['home'] = "/var/opt/postgres-gitlab" + +# Redis (not needed when using external Redis) +redis['username'] = "redis-gitlab" +redis['shell'] = "/bin/false" +redis['home'] = "/var/opt/redis-gitlab" # And so on for users/groups for GitLab CI GitLab Mattermost ```