From 7847af6e63e7adef6ec8d99a1809e91472d2bc2d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 05 Sep 2013 09:14:22 -0400
Subject: [PATCH] Restore blockpush and localclone hooks to binaries (issue-303)

---
 src/site/setup_authentication.mkd |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/src/site/setup_authentication.mkd b/src/site/setup_authentication.mkd
index 7f60618..3fb4a6c 100644
--- a/src/site/setup_authentication.mkd
+++ b/src/site/setup_authentication.mkd
@@ -6,6 +6,8 @@
 
 * LDAP authentication
 * Windows authentication
+* PAM authentication
+* Htpasswd authentication
 * Redmine auhentication
 * Salesforce.com authentication
 * Servlet container authentication
@@ -83,6 +85,20 @@
     realm.userService = com.gitblit.WindowsUserService
     realm.windows.defaultDomain =
 
+### 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.
+
+    realm.userService = com.gitblit.PAMUserService
+    realm.pam.serviceName = system-auth
+
+### Htpasswd Authentication
+
+Htpasswd authentication allows you to maintain your user credentials in an Apache htpasswd file thay may be shared with other htpasswd-capable servers.
+
+    realm.userService = com.gitblit.HtpasswdUserService
+    realm.htpasswd.userFile = /path/to/htpasswd
+
 ### Redmine Authentication
 
 You may authenticate your users against a Redmine installation as long as your Redmine install has properly enabled [API authentication](http://www.redmine.org/projects/redmine/wiki/Rest_Api#Authentication).  This user service only supports user authentication; it does not support team creation based on Redmine groups.  Redmine administrators will also be Gitblit administrators.

--
Gitblit v1.9.1