loveisgrief/muwire
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use defaults for the i2p.properties

Browse Source 
This will help writing custom properties
 as not everthing will have to be specified in them

#32 - Docker image
This commit is contained in:
LoveIsGrief
2020-01-14 12:29:05 +01:00
parent 489a7518c3
commit 65e073b1b9
3 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/src/main/groovy/com/muwire/core/Core.groovy
View File

@ -128,23 +128,23 @@ public class Core {
this.muOptions = props
i2pOptions = new Properties()
def i2pOptionsFile = new File(home,"i2p.properties")
// Read defaults
def defaultI2PFile = getClass()
.getClassLoader().getResource("defaults/i2p.properties");
defaultI2PFile.withInputStream { i2pOptions.load(it) }
def i2pOptionsFile = new File(home, "i2p.properties")
if (i2pOptionsFile.exists()) {
i2pOptionsFile.withInputStream { i2pOptions.load(it) }
if (!i2pOptions.containsKey("inbound.nickname"))
i2pOptions["inbound.nickname"] = "MuWire"
if (!i2pOptions.containsKey("outbound.nickname"))
i2pOptions["outbound.nickname"] = "MuWire"
} else {
i2pOptions["inbound.nickname"] = "MuWire"
i2pOptions["outbound.nickname"] = "MuWire"
i2pOptions["inbound.length"] = "3"
i2pOptions["inbound.quantity"] = "4"
i2pOptions["outbound.length"] = "3"
i2pOptions["outbound.quantity"] = "4"
i2pOptions["i2cp.tcp.host"] = "127.0.0.1"
i2pOptions["i2cp.tcp.port"] = "7654"
if (!i2pOptions.containsKey("outbound.nickname"))
i2pOptions["outbound.nickname"] = "MuWire"
}
if (!(i2pOptions.hasProperty("i2np.ntcp.port")
&& i2pOptions.hasProperty("i2np.udp.port")
)) {
Random r = new Random()
int port = r.nextInt(60000) + 4000
i2pOptions["i2np.ntcp.port"] = String.valueOf(port)

8
core/src/main/resources/defaults/i2p.properties Normal file
View File

@ -0,0 +1,8 @@
inbound.nickname="MuWire"
outbound.nickname="MuWire"
inbound.length="3"
inbound.quantity="4"
outbound.length="3"
outbound.quantity="4"
i2cp.tcp.host="127.0.0.1"
i2cp.tcp.port="7654"

1
docker/rootfs/muwire/.MuWire/i2p.properties
View File

@ -1,2 +1 @@
i2cp.tcp.host=172.17.0.1
i2cp.tcp.port=7654