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

(refs #204)Add some way to configure data directory.

Browse Source 
1) system property of JVM (e.g. -Dgitbucket.home=PATH_TO_DATADIR)
2) java -jar gitbucket.war --data=PATH_TO_DATADIR
3) Add context parameter "gitbucket.home" to web.xml
This commit is contained in:
takezoe
2013-11-30 05:18:15 +09:00
parent bbff75e037
commit b3669f6d66
4 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,8 @@ public class JettyLauncher {
contextPath = dim[1];
} else if(dim[0].equals("--https") && (dim[1].equals("1") || dim[1].equals("true"))) {
forceHttps = true;
} else if(dim[0].equals("--data")){
System.setProperty("gitbucket.home", dim[1]);
}
}
}

6
src/main/scala/servlet/AutoUpdateListener.scala
View File

@@ -87,7 +87,7 @@ object AutoUpdate {
/**
* The version file (GITBUCKET_HOME/version).
*/
val versionFile = new File(GitBucketHome, "version")
lazy val versionFile = new File(GitBucketHome, "version")
/**
* Returns the current version from the version file.
@@ -115,6 +115,10 @@ class AutoUpdateListener extends ServletContextListener {
private val logger = LoggerFactory.getLogger(classOf[AutoUpdateListener])
override def contextInitialized(event: ServletContextEvent): Unit = {
val datadir = event.getServletContext.getInitParameter("gitbucket.home")
if(datadir != null){
System.setProperty("gitbucket.home", datadir)
}
org.h2.Driver.load()
event.getServletContext.setInitParameter("db.url", s"jdbc:h2:${DatabaseHome}")

12
src/main/scala/util/Directory.scala
View File

@@ -8,9 +8,15 @@ import util.ControlUtil._
*/
object Directory {
val GitBucketHome = (scala.util.Properties.envOrNone("GITBUCKET_HOME") match {
case Some(env) => new File(env)
case None => new File(System.getProperty("user.home"), "gitbucket")
val GitBucketHome = (System.getProperty("gitbucket.home") match {
// -Dgitbucket.home=<path>
case path if(path != null) => new File(path)
case _ => scala.util.Properties.envOrNone("GITBUCKET_HOME") match {
// environment variable GITBUCKET_HOME
case Some(env) => new File(env)
// default is HOME/gitbucket
case None => new File(System.getProperty("user.home"), "gitbucket")
}
}).getAbsolutePath
val GitBucketConf = new File(GitBucketHome, "gitbucket.conf")

32
src/main/webapp/WEB-INF/web.xml
View File

@@ -27,28 +27,6 @@
<servlet-name>GitRepositoryServlet</servlet-name>
<url-pattern>/git/*</url-pattern>
</servlet-mapping>
<!--
<filter>
<filter-name>TransactionFilter</filter-name>
<filter-class>servlet.TransactionFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>TransactionFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
-->
<!--
<filter>
<filter-name>BasicAuthenticationFilter</filter-name>
<filter-class>servlet.BasicAuthenticationFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>BasicAuthenticationFilter</filter-name>
<url-pattern>/git/*</url-pattern>
</filter-mapping>
-->
<!-- ===================================================================== -->
<!-- H2 database configuration -->
@@ -103,4 +81,14 @@
<session-timeout>1440</session-timeout>
</session-config>
<!-- ===================================================================== -->
<!-- Optional configurations -->
<!-- ===================================================================== -->
<!--
<context-param>
<param-name>gitbucket.home</param-name>
<param-value>PATH_TO_DATADIR</param-value>
</context-param>
-->
</web-app>