Documentation

diff --git a/build.xml b/build.xml
index 87f306ab64811112feb185eed76dfe17592f4e9e..a802c8276938c010cdeeaefd1a70b6e65d890983 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -558,6 +558,8 @@
                                                <page name="mirrors" src="setup_mirrors.mkd" />\r
                                                <page name="scaling" src="setup_scaling.mkd" />\r
                                                <divider />\r
+                                               <page name="plugins" src="setup_plugins.mkd" />\r
+                                               <divider />\r
                                                <page name="Gitblit as a viewer" src="setup_viewer.mkd" />\r
                                        </menu>\r
                                        <divider />\r
@@ -875,6 +877,8 @@
                                                        <page name="mirrors" src="setup_mirrors.mkd" />\r
                                                        <page name="scaling" src="setup_scaling.mkd" />\r
                                                        <divider />\r
+                                                       <page name="plugins" src="setup_plugins.mkd" />\r
+                                                       <divider />\r
                                                        <page name="Gitblit as a viewer" src="setup_viewer.mkd" />\r
                                                </menu>\r
                                                <divider />\r

diff --git a/releases.moxie b/releases.moxie
index bba8de3fed3f8524823129c1fbf59e0a4a5c13db..7f9106186ae10b2eb91035ffc8acada3c6449670 100644 (file)
--- a/releases.moxie
+++ b/releases.moxie
@@ -24,6 +24,8 @@ r22: {
     - Option to allow LDAP users to directly authenticate without performing LDAP searches (pr-162)
     - Replace JCommander with args4j to be consistent with other tools (ticket-28)
     additions:
+    - Added an SSH daemon with public key authentication (issue-369, ticket-6)
+    - Added beginnings of a plugin framework for extending Gitblit (issue-381, ticket-23)
     - Added a French translation (pr-163)
     dependencyChanges:
     - args4j 2.0.26
@@ -37,6 +39,13 @@ r22: {
     settings:
     - { name: 'realm.ldap.bindpattern', defaultValue: ' ' }
     - { name: 'tickets.closeOnPushCommitMessageRegex', defaultValue: '(?:fixes|closes)[\\s-]+#?(\\d+)' }
+    - { name: 'git.sshPort', defaultValue: '29418' }
+    - { name: 'git.sshBindInterface', defaultValue: ' ' }
+    - { name: 'git.sshKeysManager', defaultValue: 'com.gitblit.transport.ssh.FileKeyManager' }
+    - { name: 'git.sshKeysFolder', defaultValue: '${baseFolder}/ssh' }
+    - { name: 'git.sshBackend', defaultValue: 'NIO2' }
+    - { name: 'git.sshCommandStartThreads', defaultValue: '2' }
+    - { name: 'plugins.folder', defaultValue: '${baseFolder}/plugins' }
 }
 
 #

diff --git a/src/site/setup_plugins.mkd b/src/site/setup_plugins.mkd
new file mode 100644 (file)
index 0000000..4e5c733
--- /dev/null
+++ b/src/site/setup_plugins.mkd
@@ -0,0 +1,6 @@
+\r
+## Gitblit Plugins\r
+\r
+*SINCE 1.5.0*\r
+\r
+Document (limited) plugin infrastructure.\r