Change default value of dns_server and mention that it has to be an IP
This commit is contained in:
@@ -81,7 +81,7 @@ ssl_key_file = "/etc/ddns-service/key.pem" # required if ssl = true
|
|||||||
path = "/var/lib/ddns-service/ddns.db" # required for sqlite
|
path = "/var/lib/ddns-service/ddns.db" # required for sqlite
|
||||||
|
|
||||||
[dns_service]
|
[dns_service]
|
||||||
# dns_server = "localhost" # default: "localhost" (DNS server for RFC 2136 updates)
|
# dns_server = "127.0.0.1" # default: "127.0.0.1" (must be IP address)
|
||||||
# dns_port = 53 # default: 53
|
# dns_port = 53 # default: 53
|
||||||
# dns_timeout = 5 # default: 5 (seconds)
|
# dns_timeout = 5 # default: 5 (seconds)
|
||||||
# ddns_default_key_file = "/etc/ddns-service/ddns.key" # optional, BIND TSIG key file
|
# ddns_default_key_file = "/etc/ddns-service/ddns.key" # optional, BIND TSIG key file
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ path = "/var/lib/ddns-service/ddns.db" # required for sqlite
|
|||||||
# database = "ddns" # required for mariadb
|
# database = "ddns" # required for mariadb
|
||||||
|
|
||||||
[dns_service]
|
[dns_service]
|
||||||
# dns_server = "localhost" # default
|
# dns_server = "127.0.0.1" # default, must be IP address
|
||||||
# dns_port = 53 # default
|
# dns_port = 53 # default
|
||||||
# dns_timeout = 5 # default, seconds
|
# dns_timeout = 5 # default, seconds
|
||||||
# ddns_default_key_file = "/etc/ddns-service/ddns.key" # optional, BIND TSIG key
|
# ddns_default_key_file = "/etc/ddns-service/ddns.key" # optional, BIND TSIG key
|
||||||
|
|||||||
@@ -145,7 +145,7 @@ def load_config(config_path):
|
|||||||
cfg["database"].setdefault("backend", "sqlite")
|
cfg["database"].setdefault("backend", "sqlite")
|
||||||
|
|
||||||
cfg.setdefault("dns_service", {})
|
cfg.setdefault("dns_service", {})
|
||||||
cfg["dns_service"].setdefault("dns_server", "localhost")
|
cfg["dns_service"].setdefault("dns_server", "127.0.0.1")
|
||||||
cfg["dns_service"].setdefault("dns_port", 53)
|
cfg["dns_service"].setdefault("dns_port", 53)
|
||||||
cfg["dns_service"].setdefault("dns_timeout", 5)
|
cfg["dns_service"].setdefault("dns_timeout", 5)
|
||||||
cfg["dns_service"].setdefault("cleanup_interval", 60)
|
cfg["dns_service"].setdefault("cleanup_interval", 60)
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ def init_database(config: dict):
|
|||||||
logging.info(f"Database backend: SQLite path={db_path}")
|
logging.info(f"Database backend: SQLite path={db_path}")
|
||||||
|
|
||||||
elif backend == "mariadb":
|
elif backend == "mariadb":
|
||||||
new_db = MySQLDatabase(
|
db = MySQLDatabase(
|
||||||
config["database"]["database"],
|
config["database"]["database"],
|
||||||
host=config["database"].get("host", "localhost"),
|
host=config["database"].get("host", "localhost"),
|
||||||
port=config["database"].get("port", 3306),
|
port=config["database"].get("port", 3306),
|
||||||
@@ -89,10 +89,8 @@ def init_database(config: dict):
|
|||||||
password=config["database"]["password"],
|
password=config["database"]["password"],
|
||||||
)
|
)
|
||||||
# Re-bind models to new database
|
# Re-bind models to new database
|
||||||
User._meta.database = new_db
|
User._meta.database = db
|
||||||
Hostname._meta.database = new_db
|
Hostname._meta.database = db
|
||||||
# Replace global db reference
|
|
||||||
db = new_db
|
|
||||||
logging.info(f"Database backend: MariaDB db={config['database']['database']}")
|
logging.info(f"Database backend: MariaDB db={config['database']['database']}")
|
||||||
|
|
||||||
else:
|
else:
|
||||||
|
|||||||
Reference in New Issue
Block a user