summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-07-08 23:35:45 +0000
committerEvan Read <eread@gitlab.com>2019-07-08 23:35:45 +0000
commit98b7d489e1abec1bc446c0d9485988aa82c37bda (patch)
treee619e1c9f6b8d9099d10ba7e4675e105ddd12b96
parentc453b76a54a00391fcfe087951af270fdf3241c5 (diff)
parentd3824fbfd97476edb409191fc998d75e81b322bf (diff)
downloadgitlab-ce-98b7d489e1abec1bc446c0d9485988aa82c37bda.tar.gz
Merge branch 'if-smartcard_required_for_git_access_doc' into 'master'
Doc for "Require session with smartcard login for Git access" See merge request gitlab-org/gitlab-ce!30466
-rw-r--r--doc/administration/auth/smartcard.md28
1 files changed, 28 insertions, 0 deletions
diff --git a/doc/administration/auth/smartcard.md b/doc/administration/auth/smartcard.md
index 2f3289d6102..a0d4e9ef3b5 100644
--- a/doc/administration/auth/smartcard.md
+++ b/doc/administration/auth/smartcard.md
@@ -184,3 +184,31 @@ attribute. As a prerequisite, you must use an LDAP server that:
1. Save the file and [restart](../restart_gitlab.md#installations-from-source)
GitLab for the changes to take effect.
+
+### Require browser session with smartcard sign-in for Git access
+
+**For Omnibus installations**
+
+1. Edit `/etc/gitlab/gitlab.rb`:
+
+ ```ruby
+ gitlab_rails['smartcard_required_for_git_access'] = true
+ ```
+
+1. Save the file and [reconfigure](../restart_gitlab.md#omnibus-gitlab-reconfigure)
+ GitLab for the changes to take effect.
+
+**For installations from source**
+
+1. Edit `config/gitlab.yml`:
+
+ ```yaml
+ ## Smartcard authentication settings
+ smartcard:
+ # snip...
+ # Browser session with smartcard sign-in is required for Git access
+ required_for_git_access: true
+ ```
+
+1. Save the file and [restart](../restart_gitlab.md#installations-from-source)
+ GitLab for the changes to take effect.