Merge pull request #46 from cwh42/master

Fixed tld, .site -> .suse. bnc#922765
yast · Jun 23, 2015 · a5ae4e9 · a5ae4e9
2 parents ff8c9d8 + 9ecaeb9
commit a5ae4e9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/package/yast2-dns-server.changes b/package/yast2-dns-server.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jun 22 16:16:14 UTC 2015 - cwh@suse.com
+
+- bnc#922765
+  - changed default TLD from .site to .suse
+- 3.1.13
+
 -------------------------------------------------------------------
 Thu Jun 18 11:23:54 UTC 2015 - igonzalezsosa@suse.com
 

diff --git a/package/yast2-dns-server.spec b/package/yast2-dns-server.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-dns-server
-Version:        3.1.12
+Version:        3.1.13
 Release:        0
 Url:            https://github.com/yast/yast-dns-server
 
@@ -55,9 +55,8 @@ Requires:       sed
 # FATE #303386: Network setup tools
 Requires:       yast2-sysconfig
 
-# DnsServerApi moved to yast2.rpm (bnc#392606)
-# DnsServerAPI::GetReverseIPforIPv6
-Requires:       yast2 >= 2.17.8
+# for default TLD definition
+Requires:       yast2 >= 3.1.134
 
 BuildArch:      noarch
 

diff --git a/src/modules/DnsZones.pm b/src/modules/DnsZones.pm
@@ -162,7 +162,8 @@ sub GetDefaultSOA {
 
     my $fqdn = $self->GetFQDN();
     if ($fqdn eq "") {
-	$fqdn = "linux.site";
+        my $tld = $Hostname::DefaultDomain;
+        $fqdn = "linux.$tld";
     }
 
     $fqdn = "$fqdn.";