Commit 9fb1d560 authored by Marcel Amirault's avatar Marcel Amirault

Merge branch 'docs-20200116-fix-fenced-blocks' into 'master'

Add language tags to code blocks

See merge request gitlab-org/gitlab!23208
parents 68c953c8 6295bd7c
...@@ -78,7 +78,7 @@ On the sign in page there should now be a Crowd tab in the sign in form. ...@@ -78,7 +78,7 @@ On the sign in page there should now be a Crowd tab in the sign in form.
If you see an error message like the one below when you sign in after Crowd authentication is configured, you may want to consult the Crowd administrator for the Crowd log file to know the exact cause: If you see an error message like the one below when you sign in after Crowd authentication is configured, you may want to consult the Crowd administrator for the Crowd log file to know the exact cause:
``` ```plaintext
could not authorize you from Crowd because invalid credentials could not authorize you from Crowd because invalid credentials
``` ```
......
...@@ -56,7 +56,7 @@ Using PowerShell you can output the **OU** structure as a table (_all names are ...@@ -56,7 +56,7 @@ Using PowerShell you can output the **OU** structure as a table (_all names are
Get-ADObject -LDAPFilter "(objectClass=*)" -SearchBase 'OU=GitLab INT,DC=GitLab,DC=org' -Properties CanonicalName | Format-Table Name,CanonicalName -A Get-ADObject -LDAPFilter "(objectClass=*)" -SearchBase 'OU=GitLab INT,DC=GitLab,DC=org' -Properties CanonicalName | Format-Table Name,CanonicalName -A
``` ```
``` ```plaintext
OU CanonicalName OU CanonicalName
---- ------------- ---- -------------
GitLab INT GitLab.org/GitLab INT GitLab INT GitLab.org/GitLab INT
...@@ -109,7 +109,7 @@ The two Active Directory specific values are `active_directory: true` and `uid: ...@@ -109,7 +109,7 @@ The two Active Directory specific values are `active_directory: true` and `uid:
### Example `gitlab.rb` LDAP ### Example `gitlab.rb` LDAP
``` ```ruby
gitlab_rails['ldap_enabled'] = true gitlab_rails['ldap_enabled'] = true
gitlab_rails['ldap_servers'] = { gitlab_rails['ldap_servers'] = {
'main' => { 'main' => {
...@@ -186,7 +186,7 @@ ldapsearch -D "CN=GitLabSRV,CN=Users,DC=GitLab,DC=org" -w Password1 -p 389 -h ad ...@@ -186,7 +186,7 @@ ldapsearch -D "CN=GitLabSRV,CN=Users,DC=GitLab,DC=org" -w Password1 -p 389 -h ad
**Full output of `ldapsearch` command:** - Filtering for _CN=Leroy Fox_ **Full output of `ldapsearch` command:** - Filtering for _CN=Leroy Fox_
``` ```plaintext
# LDAPv3 # LDAPv3
# base <OU=GitLab INT,DC=GitLab,DC=org> with scope subtree # base <OU=GitLab INT,DC=GitLab,DC=org> with scope subtree
# filter: CN=Leroy Fox # filter: CN=Leroy Fox
......
...@@ -45,7 +45,7 @@ JWT will provide you with a secret key for you to use. ...@@ -45,7 +45,7 @@ JWT will provide you with a secret key for you to use.
For installation from source: For installation from source:
``` ```yaml
- { name: 'jwt', - { name: 'jwt',
args: { args: {
secret: 'YOUR_APP_SECRET', secret: 'YOUR_APP_SECRET',
......
...@@ -131,14 +131,14 @@ attribute. As a prerequisite, you must use an LDAP server that: ...@@ -131,14 +131,14 @@ attribute. As a prerequisite, you must use an LDAP server that:
- The additional NGINX server context must be configured to run on a different - The additional NGINX server context must be configured to run on a different
port: port:
``` ```plaintext
listen *:3444 ssl; listen *:3444 ssl;
``` ```
- The additional NGINX server context must be configured to require the client - The additional NGINX server context must be configured to require the client
side certificate: side certificate:
``` ```plaintext
ssl_verify_depth 2; ssl_verify_depth 2;
ssl_client_certificate /etc/ssl/certs/CA.pem; ssl_client_certificate /etc/ssl/certs/CA.pem;
ssl_verify_client on; ssl_verify_client on;
...@@ -147,14 +147,14 @@ attribute. As a prerequisite, you must use an LDAP server that: ...@@ -147,14 +147,14 @@ attribute. As a prerequisite, you must use an LDAP server that:
- The additional NGINX server context must be configured to forward the client - The additional NGINX server context must be configured to forward the client
side certificate: side certificate:
``` ```plaintext
proxy_set_header X-SSL-Client-Certificate $ssl_client_escaped_cert; proxy_set_header X-SSL-Client-Certificate $ssl_client_escaped_cert;
``` ```
For example, the following is an example server context in an NGINX For example, the following is an example server context in an NGINX
configuration file (eg. in `/etc/nginx/sites-available/gitlab-ssl`): configuration file (eg. in `/etc/nginx/sites-available/gitlab-ssl`):
``` ```plaintext
server { server {
listen *:3444 ssl; listen *:3444 ssl;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment