support env for docker
parent
d85e4422c9
commit
c852241b52
File diff suppressed because one or more lines are too long
|
@ -20,6 +20,7 @@ import time
|
||||||
import logging
|
import logging
|
||||||
import sys
|
import sys
|
||||||
import argparse
|
import argparse
|
||||||
|
import os
|
||||||
|
|
||||||
parser = argparse.ArgumentParser(description='Import array of standard Passive DNS cof format into your Passive DNS server')
|
parser = argparse.ArgumentParser(description='Import array of standard Passive DNS cof format into your Passive DNS server')
|
||||||
parser.add_argument('--file', dest='filetoimport', help='JSON file to import')
|
parser.add_argument('--file', dest='filetoimport', help='JSON file to import')
|
||||||
|
@ -47,8 +48,11 @@ logger.addHandler(ch)
|
||||||
|
|
||||||
logger.info("Starting and using FIFO {} from D4 server".format(myqueue))
|
logger.info("Starting and using FIFO {} from D4 server".format(myqueue))
|
||||||
|
|
||||||
|
analyzer_redis_host = os.getenv('D4_ANALYZER_REDIS_HOST', '127.0.0.1')
|
||||||
|
analyzer_redis_port = int(os.getenv('D4_ANALYZER_REDIS_PORT', 6400))
|
||||||
|
|
||||||
d4_server = config.get('global', 'd4-server')
|
d4_server = config.get('global', 'd4-server')
|
||||||
r = redis.Redis(host="127.0.0.1",port=6400)
|
r = redis.Redis(host=analyzer_redis_host, port=analyzer_redis_port)
|
||||||
r_d4 = redis.Redis(host=d4_server.split(':')[0], port=d4_server.split(':')[1], db=2)
|
r_d4 = redis.Redis(host=d4_server.split(':')[0], port=d4_server.split(':')[1], db=2)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -22,6 +22,7 @@ import configparser
|
||||||
import time
|
import time
|
||||||
import logging
|
import logging
|
||||||
import sys
|
import sys
|
||||||
|
import os
|
||||||
|
|
||||||
config = configparser.RawConfigParser()
|
config = configparser.RawConfigParser()
|
||||||
config.read('../etc/analyzer.conf')
|
config.read('../etc/analyzer.conf')
|
||||||
|
@ -45,8 +46,11 @@ logger.addHandler(ch)
|
||||||
|
|
||||||
logger.info("Starting and using FIFO {} from D4 server".format(myqueue))
|
logger.info("Starting and using FIFO {} from D4 server".format(myqueue))
|
||||||
|
|
||||||
|
analyzer_redis_host = os.getenv('D4_ANALYZER_REDIS_HOST', '127.0.0.1')
|
||||||
|
analyzer_redis_port = int(os.getenv('D4_ANALYZER_REDIS_PORT', 6400))
|
||||||
|
|
||||||
d4_server = config.get('global', 'd4-server')
|
d4_server = config.get('global', 'd4-server')
|
||||||
r = redis.Redis(host="127.0.0.1",port=6400)
|
r = redis.Redis(host=analyzer_redis_host, port=analyzer_redis_port)
|
||||||
r_d4 = redis.Redis(host=d4_server.split(':')[0], port=d4_server.split(':')[1], db=2)
|
r_d4 = redis.Redis(host=d4_server.split(':')[0], port=d4_server.split(':')[1], db=2)
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue