From d2608d36e47a1527aa44ae0d4b19a97683ece092 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axil@gitlab.com>
Date: Mon, 26 Mar 2018 17:48:12 +0200
Subject: Copyedit JWT docs

---
 doc/integration/jwt.md      | 74 ---------------------------------------------
 doc/integration/omniauth.md |  2 +-
 2 files changed, 1 insertion(+), 75 deletions(-)
 delete mode 100644 doc/integration/jwt.md

(limited to 'doc/integration')

diff --git a/doc/integration/jwt.md b/doc/integration/jwt.md
deleted file mode 100644
index 765b7098b81..00000000000
--- a/doc/integration/jwt.md
+++ /dev/null
@@ -1,74 +0,0 @@
-# Integrate your server with JWT
-
-To enable the JWT OmniAuth provider you must register your application with JWT.
-JWT will provide you with a secret key for you to use.
-
-1.  On your GitLab server, open the configuration file.
-
-    For omnibus package:
-
-    ```sh
-      sudo editor /etc/gitlab/gitlab.rb
-    ```
-
-    For installations from source:
-
-    ```sh
-      cd /home/git/gitlab
-
-      sudo -u git -H editor config/gitlab.yml
-    ```
-
-1.  See [Initial OmniAuth Configuration](omniauth.md#initial-omniauth-configuration) for initial settings.
-
-1.  Add the provider configuration:
-
-    For omnibus package:
-
-    ```ruby
-      gitlab_rails['omniauth_providers'] = [
-        { name: 'jwt',
-          app_secret: 'YOUR_APP_SECRET',
-          args: {
-                  algorithm: 'HS256',
-                  uid_claim: 'email',
-                  required_claims: ["name", "email"],
-                  info_maps: { name: "name", email: "email" },
-                  auth_url: 'https://example.com/',
-                  valid_within: nil,
-                }
-        }
-      ]
-    ```
-
-    For installation from source:
-
-    ```
-      - { name: 'jwt',
-          app_secret: 'YOUR_APP_SECRET',
-          args: {
-                  algorithm: 'HS256',
-                  uid_claim: 'email',
-                  required_claims: ["name", "email"],
-                  info_map: { name: "name", email: "email" },
-                  auth_url: 'https://example.com/',
-                  valid_within: nil,
-                }
-        }
-    ```
-
-    __For more information on each configuration option refer to the [OmniAuth JWT usage documentation](https://github.com/mbleigh/omniauth-jwt#usage).__
-
-1.  Change 'YOUR_APP_SECRET' to the client secret.
-
-1.  Save the configuration file.
-
-1.  [Reconfigure GitLab][] or [restart GitLab][] for the changes to take effect if you
-    installed GitLab via Omnibus or from source respectively.
-
-On the sign in page there should now be a JWT icon below the regular sign in form.
-Click the icon to begin the authentication process. JWT will ask the user to sign in and authorize the GitLab application.
-If everything goes well the user will be returned to GitLab and will be signed in.
-
-[reconfigure GitLab]: ../administration/restart_gitlab.md#omnibus-gitlab-reconfigure
-[restart GitLab]: ../administration/restart_gitlab.md#installations-from-source
diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md
index c6cc023d7bf..3edde3de83d 100644
--- a/doc/integration/omniauth.md
+++ b/doc/integration/omniauth.md
@@ -32,7 +32,7 @@ contains some settings that are common for all providers.
 - [Auth0](auth0.md)
 - [Authentiq](../administration/auth/authentiq.md)
 - [OAuth2Generic](oauth2_generic.md)
-- [JWT](jwt.md)
+- [JWT](../administration/auth/jwt.md)
 
 ## Initial OmniAuth Configuration
 
-- 
cgit v1.2.1