Invalid $ORIGIN record

[do11]

1. $ORIGIN and $TTL records placed in wrong order - after SOA - which make named fail to parse them properly. SOA record should already have $ORIGIN applied. Thus, they should be placed before SOA.

2. $ORIGIN is not robust against . at the end of domain names.

[do11]

Fix:

diff --git a/zonefile.rb b/zonefile.rb
index 6da7ca1..c691136 100644
--- a/zonefile.rb
+++ b/zonefile.rb
@@ -389,6 +390,8 @@ class Zonefile
 ;  Database file #{@filename || 'unknown'} for #{@origin || 'unknown'} zone.
 ;      Zone version: #{self.soa[:serial]}
 ;
+#{@origin ? "$ORIGIN #{@origin.chomp('.')}." : ''}
+#{@ttl ? "$TTL #{@ttl}" : ''}
 #{self.soa[:origin]}           #{self.soa[:ttl]} IN  SOA  #{self.soa[:primary]} #{self.soa[:email]} (
                                #{self.soa[:serial]}    ; serial number
                                #{self.soa[:refresh]}   ; refresh
@@ -397,8 +400,6 @@ class Zonefile
                                #{self.soa[:minimumTTL]}        ; minimum TTL
                                )

-#{@origin ? "$ORIGIN #{@origin}" : ''}
-#{@ttl ? "$TTL #{@ttl}" : ''}
 ENDH
    out << "\n; Zone NS Records\n" unless self.ns.empty?
    self.ns.each do |ns|