luzifer/dns
1
0
Fork 0
mirror of https://github.com/Luzifer/dns.git synced 2024-12-23 03:11:20 +00:00
Code Issues Releases Wiki Activity

Multiple fixes

Browse source
This commit is contained in:
Knut Ahlers 2018-02-05 07:34:59 +01:00
parent d234b7b2e4
commit ece33bdcf7
Signed by: luzifer
GPG key ID: DC2729FDD34BE99E
3 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cron_generate.go
View file

@ -33,7 +33,7 @@ func generateZonefiles() {
ctx, cancel := context.WithTimeout(context.Background(), 59*time.Second) ctx, cancel := context.WithTimeout(context.Background(), 59*time.Second)
defer cancel() defer cancel()
cmd := exec.CommandContext(ctx, "/usr/bin/python", "generateZonefiles.py") cmd := exec.CommandContext(ctx, "/usr/bin/python3", "generateZonefiles.py")
cmd.Stdout = iw cmd.Stdout = iw
cmd.Stderr = ew cmd.Stderr = ew
cmd.Dir = "/src" cmd.Dir = "/src"

4
generateZonefiles.py
View file

@ -63,8 +63,6 @@ def resolve_alias(entry):
raise Exception( raise Exception(
"Alias {} was not resolvable: No answers!".format(entry['alias'])) "Alias {} was not resolvable: No answers!".format(entry['alias']))
answers.sort()
for rdata in answers: for rdata in answers:
new_entry = entry.copy() new_entry = entry.copy()
del new_entry['alias'] del new_entry['alias']
@ -72,7 +70,7 @@ def resolve_alias(entry):
new_entry['data'] = rdata.address new_entry['data'] = rdata.address
result.append(new_entry) result.append(new_entry)
return result return sorted(result, key=lambda k: k['data'])
def sanitize(entry): def sanitize(entry):

1
zones.yml
View file

@ -218,7 +218,6 @@ zones:
records: records:
- 4j6vz7jbf3vama3f45pkmzjjliqgirqc.dkim.amazonses.com. - 4j6vz7jbf3vama3f45pkmzjjliqgirqc.dkim.amazonses.com.
- name: ark - name: ark
ttl:
type: A type: A
records: records:
- 31.214.232.18 - 31.214.232.18