Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-01 02:56:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #279)Remove --https option because it's possible to substitute in the base url configuration.

Browse Source
This commit is contained in:
takezoe
2014-03-01 15:24:55 +09:00
parent 374893a5ae
commit e97b5c3c89
2 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -42,7 +42,6 @@ or you can start GitBucket by `java -jar gitbucket.war` without servlet containe
- --port=[NUMBER] - --port=[NUMBER]
- --prefix=[CONTEXTPATH] - --prefix=[CONTEXTPATH]
- --host=[HOSTNAME] - --host=[HOSTNAME]
- --https=true
- --gitbucket.home=[DATA_DIR] - --gitbucket.home=[DATA_DIR]
To upgrade GitBucket, only replace gitbucket.war. All GitBucket data is stored in HOME/.gitbucket. So if you want to back up GitBucket data, copy this directory to the other disk. To upgrade GitBucket, only replace gitbucket.war. All GitBucket data is stored in HOME/.gitbucket. So if you want to back up GitBucket data, copy this directory to the other disk.
@@ -60,7 +59,8 @@ Run the following commands in `Terminal` to
Release Notes Release Notes
-------- --------
### 1.11 - End of Feb 2014 ### 1.11 - End of Feb 2014
- Base URL for redirect, notification and repository URL box is configurable - Base URL for redirection, notification and repository URL box is configurable
- Remove ```--https``` option because it's possible to substitute in the base url
- Headline anchor is available for Markdown contents such as Wiki page - Headline anchor is available for Markdown contents such as Wiki page
- Improve H2 connectivity - Improve H2 connectivity
- Label is available for pull requests not only issues - Label is available for pull requests not only issues

20
src/main/java/JettyLauncher.java
View File

@@ -25,8 +25,6 @@ public class JettyLauncher {
port = Integer.parseInt(dim[1]); port = Integer.parseInt(dim[1]);
} else if(dim[0].equals("--prefix")) { } else if(dim[0].equals("--prefix")) {
contextPath = dim[1]; contextPath = dim[1];
} else if(dim[0].equals("--https") && (dim[1].equals("1") || dim[1].equals("true"))) {
forceHttps = true;
} else if(dim[0].equals("--gitbucket.home")){ } else if(dim[0].equals("--gitbucket.home")){
System.setProperty("gitbucket.home", dim[1]); System.setProperty("gitbucket.home", dim[1]);
} }
@@ -36,7 +34,7 @@ public class JettyLauncher {
Server server = new Server(); Server server = new Server();
HttpsSupportConnector connector = new HttpsSupportConnector(forceHttps); SelectChannelConnector connector = new SelectChannelConnector();
if(host != null) { if(host != null) {
connector.setHost(host); connector.setHost(host);
} }
@@ -62,19 +60,3 @@ public class JettyLauncher {
server.join(); server.join();
} }
} }
class HttpsSupportConnector extends SelectChannelConnector {
private boolean forceHttps;
public HttpsSupportConnector(boolean forceHttps) {
this.forceHttps = forceHttps;
}
@Override
public void customize(final EndPoint endpoint, final Request request) throws IOException {
if (this.forceHttps) {
request.setScheme("https");
super.customize(endpoint, request);
}
}
}