From bfe509532de18ab310afd3b85c379e985e1b49cd Mon Sep 17 00:00:00 2001
From: Wojciech Kosior <kwojtus@protonmail.com>
Date: Tue, 16 Jun 2020 13:35:38 +0200
Subject: rename ztdns_db_connectivity -> src/ztdnslib

---
 src/hourly.py                |  2 +-
 src/perform_queries.py       |  2 +-
 src/ztdns_db_connectivity.py | 26 --------------------------
 src/ztdnslib.py              | 26 ++++++++++++++++++++++++++
 4 files changed, 28 insertions(+), 28 deletions(-)
 delete mode 100644 src/ztdns_db_connectivity.py
 create mode 100644 src/ztdnslib.py

(limited to 'src')

diff --git a/src/hourly.py b/src/hourly.py
index c81a5b7..0d371ab 100755
--- a/src/hourly.py
+++ b/src/hourly.py
@@ -6,7 +6,7 @@ from os import path, waitpid, unlink
 from time import gmtime, strftime, sleep
 
 # our own module used by several scripts in the project
-from ztdns_db_connectivity import start_db_connection, \
+from ztdnslib import start_db_connection, \
     get_default_host_address, get_ztdns_config
 
 wrapper = '/var/lib/0tdns/vpn_wrapper.sh'
diff --git a/src/perform_queries.py b/src/perform_queries.py
index c568bf6..1d20b13 100755
--- a/src/perform_queries.py
+++ b/src/perform_queries.py
@@ -7,7 +7,7 @@ import unbound
 import psycopg2
 
 # our own module used by several scripts in the project
-from ztdns_db_connectivity import start_db_connection, get_ztdns_config
+from ztdnslib import start_db_connection, get_ztdns_config
 
 class dns_queries:
     def __init__(self, dns_IP, dns_id, services):
diff --git a/src/ztdns_db_connectivity.py b/src/ztdns_db_connectivity.py
deleted file mode 100644
index 34e1e00..0000000
--- a/src/ztdns_db_connectivity.py
+++ /dev/null
@@ -1,26 +0,0 @@
-import yaml
-import psycopg2
-
-db_config_path = '/etc/0tdns/db_connection_config.yml'
-
-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'])
-    # we might later decide that each user of start_db_connection()
-    # should set it themselves - but for now, set it here
-    connection.autocommit = True
-    return connection
-
-# we'll use it for setting SNAT
-# https://stackoverflow.com/questions/166506/finding-local-ip-addresses-using-pythons-stdlib
-def get_default_host_address(remote_address):
-    import socket
-    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-    s.connect((remote_address, 80))
-    hostaddr = s.getsockname()[0]
-    s.close()
-    return hostaddr
diff --git a/src/ztdnslib.py b/src/ztdnslib.py
new file mode 100644
index 0000000..34e1e00
--- /dev/null
+++ b/src/ztdnslib.py
@@ -0,0 +1,26 @@
+import yaml
+import psycopg2
+
+db_config_path = '/etc/0tdns/db_connection_config.yml'
+
+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'])
+    # we might later decide that each user of start_db_connection()
+    # should set it themselves - but for now, set it here
+    connection.autocommit = True
+    return connection
+
+# we'll use it for setting SNAT
+# https://stackoverflow.com/questions/166506/finding-local-ip-addresses-using-pythons-stdlib
+def get_default_host_address(remote_address):
+    import socket
+    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    s.connect((remote_address, 80))
+    hostaddr = s.getsockname()[0]
+    s.close()
+    return hostaddr
-- 
cgit v1.2.3