Skip to content

Commit 044549d

Browse files
committed
Documentation
1 parent 5e37717 commit 044549d

File tree

5 files changed

+166
-1
lines changed

5 files changed

+166
-1
lines changed

build.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -683,11 +683,17 @@
683683
<page name="upgrade WAR" src="upgrade_war.mkd" />
684684
</menu>
685685
<divider />
686+
<menu name="Gitblit Express" pager="true" pagerPlacement="bottom" pagerLayout="justified">
687+
<page name="setup Express" src="setup_express.mkd" />
688+
<page name="upgrade Express" src="upgrade_express.mkd" />
689+
</menu>
690+
<divider />
686691
<page name="administration" src="administration.mkd" />
687692
<page name="authentication" src="setup_authentication.mkd" />
688693
<page name="push hooks" src="setup_hooks.mkd" />
689694
<page name="lucene indexing" src="setup_lucene.mkd" />
690695
<page name="reverse proxies" src="setup_proxy.mkd" />
696+
<page name="client app menus" src="setup_clientmenus.mkd" />
691697
<divider />
692698
<page name="Gitblit as a viewer" src="setup_viewer.mkd" />
693699
<divider />
@@ -939,11 +945,17 @@
939945
<page name="upgrade WAR" src="upgrade_war.mkd" />
940946
</menu>
941947
<divider />
948+
<menu name="Gitblit Express" pager="true" pagerPlacement="bottom" pagerLayout="justified">
949+
<page name="setup Express" src="setup_express.mkd" />
950+
<page name="upgrade Express" src="upgrade_express.mkd" />
951+
</menu>
952+
<divider />
942953
<page name="administration" src="administration.mkd" />
943954
<page name="authentication" src="setup_authentication.mkd" />
944955
<page name="push hooks" src="setup_hooks.mkd" />
945956
<page name="lucene indexing" src="setup_lucene.mkd" />
946957
<page name="reverse proxies" src="setup_proxy.mkd" />
958+
<page name="client app menus" src="setup_clientmenus.mkd" />
947959
<divider />
948960
<page name="Gitblit as a viewer" src="setup_viewer.mkd" />
949961
<divider />

releases.moxie

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ r17: {
2525
Thank you to <a href="http://syntevo.com">syntevo</a>, <a href="http://atlassian.com">Atlassian</a>, <a href="http://fournova.com">fournova</a>, and <a href="http://github.com">Github</a> for their permission and use of their artwork for the native app clone menus.
2626
''
2727
note: ''
28-
If you have forked repositories and your are upgrading to ${project.version}, please DO NOT RELOCATE your repositories folder when running ${project.version} the first time. Gitblit will update forked repository configs on the first execution and it is critical that ${git.repositoriesFolder} points to the same location used by 1.2.x.
28+
If you have forked repositories and your are upgrading to 1.3.0, please DO NOT RELOCATE your repositories folder when running ${project.version} the first time. Gitblit will update forked repository configs on the first execution and it is critical that ${git.repositoriesFolder} points to the same location used by 1.2.x.
2929
''
3030
security:
3131
- Raw servlet was insecure. If someone knew the exact repository name and path to a file, the raw blob could be retrieved bypassing security constraints. (issue 198)
@@ -107,6 +107,7 @@ r17: {
107107
- Support --baseFolder parameter in Federation Client
108108

109109
contributors:
110+
- James Moger
110111
- Bandarupalli Satyanarayana
111112
- Chad Horohoe
112113
- Christian Aistleitner
@@ -225,6 +226,7 @@ r16: {
225226
- { name: fanout.connectionLimit, defaultValue: 0 }
226227

227228
contributors:
229+
- James Moger
228230
- github/mystygage
229231
- github/ds5apn
230232
- github/kwoot
@@ -341,6 +343,7 @@ r15: {
341343
- XZ for Java 1.0
342344

343345
contributors:
346+
- James Moger
344347
- github/rafaelcavazin
345348
- github/mallowlabs
346349
- github/sauthieg
@@ -417,6 +420,7 @@ r14: {
417420
- { name: git.defaultAuthorizationControl, defaultValue: NAMED }
418421

419422
contributors:
423+
- James Moger
420424
- Steffen Gebert
421425
}
422426

@@ -486,6 +490,7 @@ r13: {
486490
- Ivy 2.2.0
487491

488492
contributors:
493+
- James Moger
489494
- Eduardo Guervos Narvaez
490495
- Lukasz Jader
491496
- github/mragab
@@ -505,6 +510,9 @@ r12: {
505510
fixes:
506511
- Fixed bug where you could not remove all selections from a RepositoryModel list (permitted users, permitted teams, hook scripts, federation sets, etc) (issue 81)
507512
- Automatically set *java.awt.headless=true* for Gitblit GO
513+
514+
contributors:
515+
- James Moger
508516
}
509517

510518
#
@@ -525,6 +533,7 @@ r11: {
525533
- Fixed EditRepositoryPage for IE8; missing save button (issue 80)
526534

527535
contributors:
536+
- James Moger
528537
- github/jonnybbb
529538
- github/mohamedmansour
530539
- github/jcrygier
@@ -540,6 +549,9 @@ r10: {
540549

541550
fixes:
542551
- Lucene folder was stored in working copy instead of in .git folder
552+
553+
contributors:
554+
- James Moger
543555
}
544556

545557
#
@@ -607,6 +619,7 @@ r9: {
607619
- Wicket 1.4.20
608620

609621
contributors:
622+
- James Moger
610623
- github/lemval
611624
- github/zakki
612625
- github/plm
@@ -622,6 +635,9 @@ r8: {
622635

623636
fixes:
624637
- Fixed bug when upgrading from users.properties to users.conf (issue 41)
638+
639+
contributors:
640+
- James Moger
625641
}
626642

627643
#
@@ -635,6 +651,9 @@ r7: {
635651
fixes:
636652
- Include missing icon resource for the manager (issue 40)
637653
- Fixed sendmail.groovy message content with incorrect tag/branch labels
654+
655+
contributors:
656+
- James Moger
638657
}
639658

640659
#
@@ -693,6 +712,9 @@ r6: {
693712
- JGit 1.2.0
694713
- Groovy 1.8.5
695714
- Clippy
715+
716+
contributors:
717+
- James Moger
696718
}
697719

698720
#
@@ -747,6 +769,7 @@ r5: {
747769
- Wicket 1.4.19
748770

749771
contributors:
772+
- James Moger
750773
- github/dadalar
751774
- github/alyandon
752775
- github/trygvis
@@ -783,6 +806,9 @@ r4: {
783806
- JGit 1.1.0
784807
- google-gson
785808
- javamail
809+
810+
contributors:
811+
- James Moger
786812
}
787813

788814
#
@@ -813,6 +839,9 @@ r3: {
813839
dependencyChanges:
814840
- MarkdownPapers 1.1.0
815841
- Jetty 7.4.3
842+
843+
contributors:
844+
- James Moger
816845
}
817846

818847
#
@@ -827,6 +856,9 @@ r2: {
827856
- clarified SSL certificate generation and configuration for both server-side and client-side
828857
- added some more troubleshooting information to documentation
829858
- replaced JavaService with Apache Commons Daemon
859+
860+
contributors:
861+
- James Moger
830862
}
831863

832864
#
@@ -837,6 +869,9 @@ r1: {
837869
id: 0.5.0
838870
date: 2011-06-26
839871
text: initial release
872+
873+
contributors:
874+
- James Moger
840875
}
841876

842877
snapshot: &r17

src/site/setup_clientmenus.mkd

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
## Client App Menus
2+
3+
*SINCE 1.3.0*
4+
5+
Gitblit supports defining menus for native platform git client clone urls. By default, Gitblit ships with client definitions for Git, SmartGit/Hg, SourceTree, Tower, and Github for Mac & Windows. Gitblit uses the browser's user-agent to help filter the list of available clients in addition to served transports and user access permissions.
6+
7+
You can define new client integrations and deactivate/remove the default integrations by creating a file *$(baseFolder}/clientapps.json*.
8+
9+
### Example definitions
10+
---JSON---
11+
[
12+
{
13+
"name": "SmartGit/Hg",
14+
"title": "syntevo SmartGit/Hg\u2122",
15+
"description": "a Git client for Windows, Mac, & Linux",
16+
"legal": "\u00a9 2013 syntevo GmbH. All rights reserved.",
17+
"cloneUrl": "smartgit://cloneRepo/${repoUrl}",
18+
"productUrl": "http://www.syntevo.com/smartgithg",
19+
"platforms": [ "windows", "macintosh", "linux" ],
20+
"icon": "smartgithg_32x32.png",
21+
"isActive": true
22+
},
23+
{
24+
"name": "GitHub",
25+
"title": "GitHub\u2122 for Windows",
26+
"description": "a free Git client for Windows",
27+
"legal": "\u00a9 2013 GitHub. All rights reserved.",
28+
"cloneUrl": "github-windows://openRepo/${repoUrl}",
29+
"productUrl": "http://windows.github.com",
30+
"transports": [ "http", "https" ],
31+
"platforms": [ "windows" ],
32+
"icon": "github_32x32.png",
33+
"isActive": true
34+
},
35+
{
36+
"name": "SparkleShare",
37+
"title": "SparkleShare\u2122",
38+
"description": "an open source collaboration and sharing tool",
39+
"legal": "released under the GPLv3 open source license",
40+
"cloneUrl": "sparkleshare://addProject/${baseUrl}/sparkleshare/${repoUrl}.xml",
41+
"productUrl": "http://sparkleshare.org",
42+
"platforms": [ "windows", "macintosh", "linux" ],
43+
"icon": "sparkleshare_32x32.png",
44+
"minimumPermission" : "RW+",
45+
"isActive": false
46+
}
47+
]
48+
---JSON---

src/site/setup_express.mkd

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
## Gitblit on RedHat's OpenShift Cloud Service
2+
3+
The Gitblit Express distribution can be copied to the root of your RedHat OpenShift
4+
application repository. Gitblit Express is an exploded WAR file with all appropriate
5+
dependencies bundled.
6+
7+
You should delete the `pom.xml` file and the `src` folder from your application repository
8+
as Gitblit Express is not a source distribution to be built with Maven on OpenShift.
9+
10+
Gitblit automatically adjusts itself to running on OpenShift. Repositories, users,
11+
federation proposals, setting overrides, and Groovy push scripts are stored in *OPENSHIFT_DATA_DIR*.
12+
13+
It is recommended to enable all RPC settings in the `web.xml` file to allow remote
14+
administration and, more importantly, configuration of your Gitblit Express
15+
installation using the Gitblit Manager.
16+
17+
It is also recommended to set *web.forwardSlashCharacter* to ! because OpenShift
18+
runs on JBoss/Tomcat behind a proxy, neither of which are friendly to embedded
19+
forward-slashes.
20+
21+
Please do not change the following settings unless you know exactly what you are
22+
doing:
23+
24+
- *git.repositoriesFolder*
25+
- *groovy.scriptsFolder*
26+
- *federation.proposalsFolder*
27+
- *realm.userService* (for standard users.conf)
28+
29+
Additionally, it is recommended to force your Gitblit installation to cleanup up
30+
older versions on your OpenShift filesystem to maximize available space for your
31+
repositories.
32+
33+
Append the following command to your ./openshift/action_hooks/build file:
34+
35+
rm -fr $OPENSHIFT_APP_DIR/jbossas-7.0/standalone/tmp/vfs/*
36+
37+
Lastly, you may want to play with the heap and permgen settings of your Gitblit
38+
instance because the default heap for the JVM is 95 MB, which may be a little
39+
tight.
40+
41+
To do that you will have to login to your account via ssh:
42+
43+
44+
45+
and then you will have to manipulate the -Xmx and -XX:MaxPermSize values.
46+
47+
vi $OPENSHIFT_APP_DIR/jbossas-7.0/bin/standalone.conf
48+
ctl_app restart
49+
50+
OpenShift currently allows 300MB of memory per application which includes ssh access, JVM, etc.
51+
The Gitblit demo hosted on OpenShift Express operates with -Xmx160m and -XX:MaxPermSize=90m.
52+
53+
For more detailed instructions on how to setup and deploy an OpenShift application
54+
please see this excellent turorial:
55+
56+
[Deploying to OpenShift](https://github.com/opensas/play-demo/wiki/Step-12.5---deploy-to-openshift)

src/site/upgrade_express.mkd

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
## Upgrading Gitblit Express
2+
3+
1. Make a backup copy of */deployments/ROOT.war/WEB-INF/web.xml*
4+
2. Delete your */deployments/ROOT.war* and then copy the new */deployments/ROOT.war* from the archive.
5+
3. Diff your backup copy of web.xml with the pristine one you copied as part of */deployments/ROOT.war* and apply any necessary changes.
6+
7+
These steps are necessary to ensure that you end up using the specified libraries and resources for the new version. Otherwise you could end up with a hybrid filesystem that would make it difficult to troubleshoot. It is important to note that the web.xml file contains both your default settings AND application configuration. Not updating the web.xml is just a likely to create problems as making a hybrid filesystem.
8+
9+
### 1.3.0 web.xml
10+
11+
- Added LogoServlet
12+
- Added SparkleShareInviteServlet
13+
- Added EnforceAuthenticationFilter
14+
- Moved GitServlet

0 commit comments

Comments
 (0)