D4
/
d4-core
mirror of https://github.com/D4-project/d4-core
2
0
Fork 0
Code Issues Releases Wiki Activity

chg: [D4Server] add server port in config

pull/49/head v1.2
Terrtia 2021-03-31 11:43:54 +02:00
parent cbb90c057a
commit 39d593364d
No known key found for this signature in database
GPG Key ID: 1E1B1F50D84613D0
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/configs/server.conf.sample
View File

@ -4,6 +4,7 @@ use_default_save_directory = yes
save_directory = None save_directory = None
[D4_Server] [D4_Server]
server_port=4443
# registration or shared-secret # registration or shared-secret
server_mode = registration server_mode = registration
default_hmac_key = private key to change default_hmac_key = private key to change

14
server/server.py
View File

@ -13,6 +13,8 @@ import argparse
import logging import logging
import logging.handlers import logging.handlers
import configparser
from twisted.internet import ssl, task, protocol, endpoints, defer from twisted.internet import ssl, task, protocol, endpoints, defer
from twisted.python import log from twisted.python import log
from twisted.python.modules import getModule from twisted.python.modules import getModule
@ -45,8 +47,16 @@ redis_server_stream = config_loader.get_redis_conn("Redis_STREAM", decode_respon
redis_server_metadata = config_loader.get_redis_conn("Redis_METADATA", decode_responses=False) redis_server_metadata = config_loader.get_redis_conn("Redis_METADATA", decode_responses=False)
# get server_mode # get server_mode
try:
D4server_port = config_loader.get_config_int("D4_Server", "server_port")
except configparser.NoOptionError:
D4server_port = 4443
server_mode = config_loader.get_config_str("D4_Server", "server_mode") server_mode = config_loader.get_config_str("D4_Server", "server_mode")
hmac_key = config_loader.get_config_str("D4_Server", "default_hmac_key") try:
hmac_key = config_loader.get_config_str("D4_Server", "default_hmac_key")
except configparser.NoOptionError:
hmac_key = 'private key to change'
config_loader = None config_loader = None
### ### ### ###
@ -555,7 +565,7 @@ def main(reactor):
certificate = ssl.PrivateCertificate.loadPEM(certData) certificate = ssl.PrivateCertificate.loadPEM(certData)
factory = protocol.Factory.forProtocol(D4_Server) factory = protocol.Factory.forProtocol(D4_Server)
# use interface to support both IPv4 and IPv6 # use interface to support both IPv4 and IPv6
reactor.listenSSL(4443, factory, certificate.options(), interface='::') reactor.listenSSL(D4server_port, factory, certificate.options(), interface='::')
return defer.Deferred() return defer.Deferred()