Skip to content

Commit

Permalink
added new variables
Browse files Browse the repository at this point in the history
  • Loading branch information
bdito committed May 27, 2016
1 parent 64629d7 commit 7fac0c0
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 2 deletions.
36 changes: 36 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ More information on [sshkeybox.com](http://sshkeybox.com/) or [GitHub](https://g

## Upgrade Information

#### Following Variables are new in 2.85.03:
dbPath
maxActive
testOnBorrow
minIdle
maxWait

#### Following Variables were removed in 2.85:
auditLogAppender
enableOTP
Expand Down Expand Up @@ -129,6 +136,35 @@ specify a external authentication module (ex: ldap-ol, ldap-ad). Edit the jaas.



### H2 DB and Connection Pool settings


#### `dbPath=`

Path to the H2 DB file. Leave Blank to use default location which is ../WEB-INF/classes/keydb


#### `maxActive=25`

Max connections in the connection pool


#### `testOnBorrow=true`

When true, objects will be validated before being returned by the connection pool


#### `minIdle=2`

The minimum number of objects allowed in the connection pool before spawning new ones


#### `maxWait=15000`

The maximum amount of time (in milliseconds) to block before throwing an exception when the connection pool is exhausted



### deprecated Environment Variables (<2.85)


Expand Down
7 changes: 6 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,9 @@ keybox:
- passwordComplexityRegEx=
- passwordComplexityMsg=
- clientIPHeader=
- jaasModule=
- jaasModule=
- dbPath=
- maxActive=
- testOnBorrow=
- minIdle=
- maxWait=
9 changes: 8 additions & 1 deletion start.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/sh

#writing variables in configuration file, i found no better way to do this
echo resetApplicationSSHKey=${resetApplicationSSHKey:-false} > /opt/KeyBox-jetty/jetty/keybox/WEB-INF/classes/KeyBoxConfig.properties
Expand All @@ -21,6 +21,13 @@ echo passwordComplexityMsg=${passwordComplexityMsg:-'Passwords must be 8 to 20 c
echo clientIPHeader=${clientIPHeader:-} >> /opt/KeyBox-jetty/jetty/keybox/WEB-INF/classes/KeyBoxConfig.properties
echo jaasModule=${jaasModule:-} >> /opt/KeyBox-jetty/jetty/keybox/WEB-INF/classes/KeyBoxConfig.properties

echo dbPath=${dbPath:-} >> /opt/KeyBox-jetty/jetty/keybox/WEB-INF/classes/KeyBoxConfig.properties
echo maxActive=${maxActive:-25} >> /opt/KeyBox-jetty/jetty/keybox/WEB-INF/classes/KeyBoxConfig.properties
echo testOnBorrow=${testOnBorrow:-true} >> /opt/KeyBox-jetty/jetty/keybox/WEB-INF/classes/KeyBoxConfig.properties
echo minIdle=${minIdle:-2} >> /opt/KeyBox-jetty/jetty/keybox/WEB-INF/classes/KeyBoxConfig.properties
echo maxWait=${maxWait:-15000} >> /opt/KeyBox-jetty/jetty/keybox/WEB-INF/classes/KeyBoxConfig.properties


#link database directory
rm -rf /opt/KeyBox-jetty/jetty/keybox/WEB-INF/classes/keydb
ln -sf /a/keydb /opt/KeyBox-jetty/jetty/keybox/WEB-INF/classes/
Expand Down

0 comments on commit 7fac0c0

Please sign in to comment.