From 6b119f76190cb2f5d38f9fb52ec5b60e65d29cc4 Mon Sep 17 00:00:00 2001 From: Wojciech Kosior Date: Fri, 12 Jun 2020 11:51:12 +0200 Subject: make it possible to disable execution of installed 0tdns --- src/ztdns_db_connectivity.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/ztdns_db_connectivity.py') diff --git a/src/ztdns_db_connectivity.py b/src/ztdns_db_connectivity.py index 86f9a44..34e1e00 100644 --- a/src/ztdns_db_connectivity.py +++ b/src/ztdns_db_connectivity.py @@ -3,8 +3,10 @@ import psycopg2 db_config_path = '/etc/0tdns/db_connection_config.yml' -def start_db_connection(): - config = yaml.safe_load(open(db_config_path, 'r')) +def get_ztdns_config(): + return yaml.safe_load(open(db_config_path, 'r')) + +def start_db_connection(config): connection = psycopg2.connect(user=config['user'], password=config['password'], host=config['host'], port=config['port'], database=config['database']) @@ -17,9 +19,8 @@ def start_db_connection(): # https://stackoverflow.com/questions/166506/finding-local-ip-addresses-using-pythons-stdlib def get_default_host_address(remote_address): import socket - config = yaml.safe_load(open(db_config_path, 'r')) s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) - s.connect((config['database'], 80)) + s.connect((remote_address, 80)) hostaddr = s.getsockname()[0] s.close() return hostaddr -- cgit v1.2.3