From 8e70bc5ece2e6dc637cdecde559869f356424b6c Mon Sep 17 00:00:00 2001 From: Charlie Jacomme Date: Wed, 27 Jun 2018 17:07:04 +0200 Subject: [PATCH] New api handling, and typos --- main.py | 5 +++-- re2oapi | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) mode change 100644 => 100755 main.py diff --git a/main.py b/main.py old mode 100644 new mode 100755 index a267c5c..1f032ba --- a/main.py +++ b/main.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 from configparser import ConfigParser import socket import datetime @@ -124,7 +125,7 @@ def write_dns_files(api_client): cname_records = "\n".join( template_cname.format(hostname=x['hostname'], - alias=x['alias']+extension=x['extension']) + alias=x['alias'],extension=x['extension']) for x in zone['cname_records'] ) @@ -153,7 +154,7 @@ api_client = Re2oAPIClient(api_hostname, api_username, api_password) client_hostname = socket.gethostname().split('.', 1)[0] -for service in api_client.list_servicesregen(): +for service in api_client.view("services/regen/"): # if service['hostname'] == client_hostname and \ # service['service_name'] == 'dns' and \ # service['need_regen']: diff --git a/re2oapi b/re2oapi index 5b4523c..b0885f7 160000 --- a/re2oapi +++ b/re2oapi @@ -1 +1 @@ -Subproject commit 5b4523c797bffb90c998d5b424548756baa0c1d2 +Subproject commit b0885f7b84245fa22ccb1b91c00d03675c1cfafc