diff --git a/doc/settings/configuration.md b/doc/settings/configuration.md index 83f82342899109b6fde925f3a366485ad35cf693_ZG9jL3NldHRpbmdzL2NvbmZpZ3VyYXRpb24ubWQ=..d27e2c2c4fa493391ec10393eba33f3490dacbdb_ZG9jL3NldHRpbmdzL2NvbmZpZ3VyYXRpb24ubWQ= 100644 --- a/doc/settings/configuration.md +++ b/doc/settings/configuration.md @@ -23,7 +23,7 @@ ### Loading configuration from external file Omnibus-gitlab package loads all configuration from `/etc/gitlab/gitlab.rb` file. -This file has strict file permissions and is owned by `root` user. The reason for strict permissions -and ownership is that `/etc/gitlab/gitlab.rb` is being executed as Ruby code by `root` user during `gitlab-ctl reconfigure`. This means +This file has strict file permissions and is owned by the `root` user. The reason for strict permissions +and ownership is that `/etc/gitlab/gitlab.rb` is being executed as Ruby code by the `root` user during `gitlab-ctl reconfigure`. This means that users who have write access to `/etc/gitlab/gitlab.rb` can add configuration that will be executed as code by `root`. @@ -28,9 +28,9 @@ that users who have write access to `/etc/gitlab/gitlab.rb` can add configuration that will be executed as code by `root`. -In certain organizations it is allowed to have access to the configuration files but not as root user. +In certain organizations it is allowed to have access to the configuration files but not as the root user. You can include an external configuration file inside `/etc/gitlab/gitlab.rb` by specifying the path to the file: ```ruby from_file "/home/admin/external_gitlab.rb" ``` @@ -31,7 +31,8 @@ You can include an external configuration file inside `/etc/gitlab/gitlab.rb` by specifying the path to the file: ```ruby from_file "/home/admin/external_gitlab.rb" ``` + Please note that code you include into `/etc/gitlab/gitlab.rb` using `from_file` will run with `root` privileges when you run `sudo gitlab-ctl reconfigure`. @@ -37,5 +38,5 @@ Please note that code you include into `/etc/gitlab/gitlab.rb` using `from_file` will run with `root` privileges when you run `sudo gitlab-ctl reconfigure`. -Any configuration that is set in `/etc/gitlab/gitlab.rb` after `from_file` is included will take precedence over the configuration from included file. +Any configuration that is set in `/etc/gitlab/gitlab.rb` after `from_file` is included will take precedence over the configuration from the included file. ### Storing Git data in an alternative directory