Merge branch 'rework' into 'master'

Rework

See merge request !2

dnscelery.py

-from os import getenv
+from os import getenv, path
 import subprocess
 import subprocess
 
 
 from kombu import Queue, Exchange
 from kombu import Queue, Exchange
@@ -8,6 +8,7 @@ from celery import Celery
 
 
 HOSTNAME = gethostname()
 HOSTNAME = gethostname()
 AMQP_URI = getenv('AMQP_URI')
 AMQP_URI = getenv('AMQP_URI')
+DNS_DB_DIR = getenv('DNS_DB_DIR', '/var/lib/circle/dnsdriver')
 
 
 celery = Celery('dnsdriver', broker=AMQP_URI)
 celery = Celery('dnsdriver', broker=AMQP_URI)
 celery.conf.update(
 celery.conf.update(
@@ -15,15 +16,15 @@ celery.conf.update(
     CELERY_TASK_RESULT_EXPIRES=300,
     CELERY_TASK_RESULT_EXPIRES=300,
     CELERY_QUEUES=(
     CELERY_QUEUES=(
         Queue(HOSTNAME + '.dns', Exchange(
         Queue(HOSTNAME + '.dns', Exchange(
-            'dnsdriver', type='direct'), routing_key='dnsdriver'),
+              'dnsdriver', type='direct'), routing_key='dnsdriver'),
     )
     )
 )
 )
 
 
 
 
 @celery.task(name='firewall.reload_dns')
 @celery.task(name='firewall.reload_dns')
-def t(data):
-    with open('/etc/sv/tinydns/root/data', 'w') as f:
+def reload_dns(data):
+    with open(path.join(DNS_DB_DIR, 'data'), 'w') as f:
         f.write('\n'.join(data))
         f.write('\n'.join(data))
-    process = subprocess.Popen(['make', '-C', '/etc/sv/tinydns/root'],
+    process = subprocess.Popen(['make', '-C', DNS_DB_DIR],
                                shell=False, stdin=subprocess.PIPE)
                                shell=False, stdin=subprocess.PIPE)
     process.communicate('\n'.join(data) + '\n')
     process.communicate('\n'.join(data) + '\n')