From 3d2245ee1ded94fbb87a603bf048b9cea2649bf1 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Fri, 8 Sep 2017 07:42:31 +0000 Subject: [PATCH] changes --- .gitignore | 1 + client/shell/yadync.sh | 4 ++-- server/yadyn | 30 +++++++++++++++--------------- 3 files changed, 18 insertions(+), 17 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0d20b64 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.pyc diff --git a/client/shell/yadync.sh b/client/shell/yadync.sh index 3ec2b93..52afb02 100755 --- a/client/shell/yadync.sh +++ b/client/shell/yadync.sh @@ -1,7 +1,7 @@ #!/bin/sh -SHAREDSECRET="test123" -DYNID="testhost" +SHAREDSECRET="geheim" +DYNID="test2" DATE=`date +%s` CHECKSUM=`echo -n "$DYNID $SHAREDSECRET $DATE" | md5sum | awk '{print $1}'` OUT="$DYNID $DATE $CHECKSUM" diff --git a/server/yadyn b/server/yadyn index cf42f33..a70c697 100755 --- a/server/yadyn +++ b/server/yadyn @@ -41,17 +41,17 @@ EVENT_LIFE_TIME = 600 NULL_ADDRESS = '0.0.0.0' TTL = 120 EXPIRY_PERIOD = 300 -NAMESERVER = '46.4.171.193' +NAMESERVER = '127.0.0.1' NAMESERVER_PORT = 53 -TSIGKEY = { "yadyn." : "+xLH8GuZnEgBljuIEM/iDA==" } -PID_FILE = "/var/db/yadyn/yadyn.pid" -ENTRIES_FILE = "/var/db/yadyn/entries" -CUSTOMERS_FILE = "/var/db/yadyn/customers" -ACTIONLOG_DIR = "/var/db/yadyn/actionlog" +TSIGKEY = { "dynamic.hottis.de" : "IDlS8yvRJLbfCLOYJMTOu9g9/d8yvftVitgNDIce2s0kG/KS1XGwM7Sg1rgWtzMjQZ6QlcVo6NeLUrjXREzZ+w==" } +PID_FILE = "/tmp/yadyn/yadyn.pid" +ENTRIES_FILE = "/tmp/yadyn/entries" +CUSTOMERS_FILE = "/tmp/yadyn/customers" +ACTIONLOG_DIR = "/tmp/yadyn/actionlog" ADMIN_PWD = 'test123' DNS_DUMMY = False -DEBUG = False -BACKGROUND = True +DEBUG = True +BACKGROUND = False @@ -113,17 +113,17 @@ try: # expirer.start() # Logger.debug("Expirer started") - cmdReceiver = CmdReceiver.CmdReceiver(("", 8023), entries, customers) + cmdReceiver = CmdReceiver.CmdReceiver(("127.0.0.1", 8023), entries, customers) cmdReceiver.start() Logger.debug("CmdReceiver started") - xmlRpcReceiver = XmlRpcReceiver.XmlRpcReceiver(("", 8024), entries) - xmlRpcReceiver.start() - Logger.debug("XmlRpcReceiver started") +# xmlRpcReceiver = XmlRpcReceiver.XmlRpcReceiver(("", 8024), entries) +# xmlRpcReceiver.start() +# Logger.debug("XmlRpcReceiver started") - httpCmdReceiver = HttpCmdReceiver.HttpCmdReceiver(("", 8025), entries, dnsq, NULL_ADDRESS) - httpCmdReceiver.start() - Logger.debug("httpCmdReceiver started") +# httpCmdReceiver = HttpCmdReceiver.HttpCmdReceiver(("", 8025), entries, dnsq, NULL_ADDRESS) +# httpCmdReceiver.start() +# Logger.debug("httpCmdReceiver started")