A few changes to ensure that some default config values always exist.
This commit is contained in:
@@ -3,7 +3,7 @@ import tempfile
|
|||||||
|
|
||||||
import pe.app
|
import pe.app
|
||||||
from packetserver.common import Response, Message, Request, PacketServerConnection, send_response, send_blank_response
|
from packetserver.common import Response, Message, Request, PacketServerConnection, send_response, send_blank_response
|
||||||
from packetserver.server.constants import default_server_config
|
from packetserver.server.constants import default_server_config, default_server_name
|
||||||
from packetserver.server.users import User
|
from packetserver.server.users import User
|
||||||
from copy import deepcopy
|
from copy import deepcopy
|
||||||
import ax25
|
import ax25
|
||||||
@@ -75,6 +75,11 @@ class Server:
|
|||||||
conn.root.config = PersistentMapping(deepcopy(default_server_config))
|
conn.root.config = PersistentMapping(deepcopy(default_server_config))
|
||||||
conn.root.server_callsign = self.callsign
|
conn.root.server_callsign = self.callsign
|
||||||
conn.root.config['blacklist'] = PersistentList()
|
conn.root.config['blacklist'] = PersistentList()
|
||||||
|
for key in ['motd', 'operator']:
|
||||||
|
if key not in conn.root.config:
|
||||||
|
conn.root.config[key] = ""
|
||||||
|
if 'server_name' not in conn.root.config:
|
||||||
|
conn.root.config.server_name = default_server_name
|
||||||
if 'SYSTEM' not in conn.root.config['blacklist']:
|
if 'SYSTEM' not in conn.root.config['blacklist']:
|
||||||
logging.debug("Adding 'SYSTEM' to blacklist in case someone feels like violating FCC rules.")
|
logging.debug("Adding 'SYSTEM' to blacklist in case someone feels like violating FCC rules.")
|
||||||
conn.root.config['blacklist'].append('SYSTEM')
|
conn.root.config['blacklist'].append('SYSTEM')
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
|
|
||||||
|
default_server_name = "Packet Server BBS"
|
||||||
|
|
||||||
default_server_config = {
|
default_server_config = {
|
||||||
"motd": "Welcome to this PacketServer BBS!",
|
"motd": "Welcome to this PacketServer BBS!",
|
||||||
"operator": "email_callsign_name_whatever",
|
"operator": "email_callsign_name_whatever",
|
||||||
"max_message_length": 2000,
|
"max_message_length": 2000,
|
||||||
"server_name": "Packet Server BBS"
|
"server_name": default_server_name
|
||||||
}
|
}
|
||||||
|
|
||||||
jobs_default = {
|
jobs_default = {
|
||||||
|
|||||||
Reference in New Issue
Block a user