From 7c4d074a3cc3c204a135ae9aa69b5314980ea8b4 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gmail.com>
Date: Sat, 04 Jul 2015 16:19:36 -0400
Subject: [PATCH] Merge pull request #281 from mrjoel/mrjoel-ticketswithexternalurl

---
 src/site/setup_authentication.mkd |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/site/setup_authentication.mkd b/src/site/setup_authentication.mkd
index 02d1be7..a3bf445 100644
--- a/src/site/setup_authentication.mkd
+++ b/src/site/setup_authentication.mkd
@@ -83,10 +83,16 @@
 
 ### PAM Authentication
 
-PAM authentication is based on the use of libpam4j and JNA.  To use this service, your Gitblit server must be installed on a Linux/Unix/MacOSX machine and the user that Gitblit runs-as must have root permissions.
+PAM authentication is based on the use of libpam4j and JNA.  To use this service, your Gitblit server must be installed on a Linux/Unix/MacOSX machine.
 
     realm.authenticationProviders = pam
-    realm.pam.serviceName = system-auth
+    realm.pam.serviceName = gitblit
+    
+Then define a gitblit authentication policy in `/etc/pam.d/gitblit`
+
+    # PAM configuration for the gitblit service
+    # Standard Un*x authentication.
+    @include common-auth
 
 ### Htpasswd Authentication
 
@@ -119,7 +125,7 @@
 
 This is the simplest choice where you implement custom authentication and delegate all other standard user and team operations to one of Gitblit's user service implementations.  This choice insulates your customization from changes in User and Team model classes and additional API that may be added to IUserService.
 
-Please subclass [com.gitblit.auth.AuthenticationProvider](https://github.com/gitblit/gitblit/blob/master/src/main/java/com/gitblit/auth/AuthenticationProvider.java).
+Please subclass [com.gitblit.auth.AuthenticationProvider.UsernamePasswordAuthenticationProvider](https://github.com/gitblit/gitblit/blob/master/src/main/java/com/gitblit/auth/AuthenticationProvider.java).
 
 You may use your subclass by specifying its fully qualified classname in the *realm.authenticationProviders* setting.
 

--
Gitblit v1.9.1