diff options
author | James Moger <james.moger@gitblit.com> | 2011-12-04 16:55:42 -0500 |
---|---|---|
committer | James Moger <james.moger@gitblit.com> | 2011-12-04 16:55:42 -0500 |
commit | 93f4729cdfc856d2a3b155bcf3e97f85b47ce760 (patch) | |
tree | 791870de5a0cfcd1072d953b17e4ba4c95f57dfd /distrib | |
parent | b774dedd7f0ab1567e790610b70eb7f2241423fb (diff) | |
download | gitblit-93f4729cdfc856d2a3b155bcf3e97f85b47ce760.tar.gz gitblit-93f4729cdfc856d2a3b155bcf3e97f85b47ce760.zip |
Implemented ConfigUserService. Fixed and deprecated FileUserService.
Diffstat (limited to 'distrib')
-rw-r--r-- | distrib/gitblit.properties | 5 | ||||
-rw-r--r-- | distrib/users.conf | 4 | ||||
-rw-r--r-- | distrib/users.properties | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties index 34361efc..39e47885 100644 --- a/distrib/gitblit.properties +++ b/distrib/gitblit.properties @@ -50,13 +50,14 @@ web.authenticateAdminPages = true # SINCE 0.5.0
web.allowCookieAuthentication = true
-# Either the path to a simple user properties file
+# Either the full path to a user config file (users.conf)
+# OR the full path to a simple user properties file (users.properties)
# OR a fully qualified class name that implements the IUserService interface.
# Any custom implementation must have a public default constructor.
#
# SINCE 0.5.0
# RESTART REQUIRED
-realm.userService = users.properties
+realm.userService = users.conf
# How to store passwords.
# Valid values are plain, md5, or combined-md5. md5 is the hash of password.
diff --git a/distrib/users.conf b/distrib/users.conf new file mode 100644 index 00000000..e9dbd83d --- /dev/null +++ b/distrib/users.conf @@ -0,0 +1,4 @@ +[user "admin"] + password = admin + role = "#admin" + role = "#notfederated" diff --git a/distrib/users.properties b/distrib/users.properties deleted file mode 100644 index 009c8e3a..00000000 --- a/distrib/users.properties +++ /dev/null @@ -1,3 +0,0 @@ -## Gitblit realm file format: username=password,\#permission,repository1,repository2...
-#Fri Jul 22 14:27:08 EDT 2011
-admin=admin,\#admin,\#notfederated
|