Hello,
Fix --ttl description for DNS zones
TTL specified in idnsZone object class affects all records at zone apex,
not only SOA record.
I have realized that current description is incorrect when I was doing doc
review.
--
Petr^2 Spacek
From 1643277c1489ae72f18ac9cd280373350a09faf2 Mon Sep 17 00:00:00 2001
From: Petr Spacek <pspa...@redhat.com>
Date: Wed, 11 Jun 2014 13:24:48 +0200
Subject: [PATCH] Fix --ttl description for DNS zones
TTL specified in idnsZone object class affects all records at zone apex,
not only SOA record.
---
install/ui/test/data/ipa_init_commands.json | 14 +++++++-------
install/ui/test/data/ipa_init_objects.json | 6 +++---
install/ui/test/data/json_metadata.json | 4 ++--
ipalib/plugins/dns.py | 4 ++--
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/install/ui/test/data/ipa_init_commands.json b/install/ui/test/data/ipa_init_commands.json
index 4214430ce984ec52cdd04e722c377cfbd95e9ade..c8766563622569062a7625d8a0279c0efa2b1d2a 100644
--- a/install/ui/test/data/ipa_init_commands.json
+++ b/install/ui/test/data/ipa_init_commands.json
@@ -7866,9 +7866,9 @@
{
"attribute": true,
"class": "Int",
- "doc": "SOA record time to live",
+ "doc": "Time to live for records at zone apex",
"flags": [],
- "label": "SOA time to live",
+ "label": "Time to live",
"maxvalue": 2147483647,
"minvalue": 0,
"name": "dnsttl",
@@ -8156,9 +8156,9 @@
{
"attribute": true,
"class": "Int",
- "doc": "SOA record time to live",
+ "doc": "Time to live for records at zone apex",
"flags": [],
- "label": "SOA time to live",
+ "label": "Time to live",
"maxvalue": 2147483647,
"minvalue": 0,
"name": "dnsttl",
@@ -8438,9 +8438,9 @@
{
"attribute": true,
"class": "Int",
- "doc": "SOA record time to live",
+ "doc": "Time to live for records at zone apex",
"flags": [],
- "label": "SOA time to live",
+ "label": "Time to live",
"maxvalue": 2147483647,
"minvalue": 0,
"name": "dnsttl",
@@ -22494,4 +22494,4 @@
"methods": {},
"objects": {}
}
-}
\ No newline at end of file
+}
diff --git a/install/ui/test/data/ipa_init_objects.json b/install/ui/test/data/ipa_init_objects.json
index 3c7fbd21f08760e7285d1e12aeb63073146e3211..8f6b25414f9301b409a0dd69126cbbedba94ed3c 100644
--- a/install/ui/test/data/ipa_init_objects.json
+++ b/install/ui/test/data/ipa_init_objects.json
@@ -4116,9 +4116,9 @@
},
{
"class": "Int",
- "doc": "SOA record time to live",
+ "doc": "Time to live for records at zone apex",
"flags": [],
- "label": "SOA time to live",
+ "label": "Time to live",
"maxvalue": 2147483647,
"minvalue": 0,
"name": "dnsttl",
@@ -8906,4 +8906,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/install/ui/test/data/json_metadata.json b/install/ui/test/data/json_metadata.json
index 928e5eafd66158ab41c40ce3f5c3b1d486cdf13f..a9e66230f94875f7da7efa73141e244b8201a5cc 100644
--- a/install/ui/test/data/json_metadata.json
+++ b/install/ui/test/data/json_metadata.json
@@ -4485,12 +4485,12 @@
"cli_name": "ttl",
"cli_short_name": null,
"default": null,
- "doc": "SOA record time to live",
+ "doc": "Time to live for records at zone apex",
"exclude": null,
"flags": [],
"hint": null,
"include": null,
- "label": "SOA time to live",
+ "label": "Time to live",
"maxvalue": 2147483647,
"minvalue": null,
"multivalue": false,
diff --git a/ipalib/plugins/dns.py b/ipalib/plugins/dns.py
index c3870f8a29b51bcfd1a0513e790a6160ed6ef883..736162368e6ec37f62a111d2007dbfc6188bf182 100644
--- a/ipalib/plugins/dns.py
+++ b/ipalib/plugins/dns.py
@@ -1764,8 +1764,8 @@ class dnszone(LDAPObject):
),
Int('dnsttl?',
cli_name='ttl',
- label=_('SOA time to live'),
- doc=_('SOA record time to live'),
+ label=_('Time to live'),
+ doc=_('Time to live for records at zone apex'),
minvalue=0,
maxvalue=2147483647, # see RFC 2181
),
--
1.9.3
_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
