palletjack-tools 0.6.5 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf23104daa00ae96dc7ad6fd8b1f5fec58caa5c5
-  data.tar.gz: 3aeaa47cb1101fd4540bb5b429805172ad749a6b
+  metadata.gz: 5d92eee0a6c8dea07d29a11ee5aedfa585db1234
+  data.tar.gz: 9b1df758774d9d6830d98a5f3ad756a080520180
 SHA512:
-  metadata.gz: 1def05807b04ec4f4c8aefa00fedc46eee1d0911103e2840d0b46ed805ced828f0f051c3ae19886eb18ba6193c59dff5f0d669440d2e27db1470f61f03d6b407
-  data.tar.gz: 2ce1bd274873d2c41372e63128dc06e4f38ecd1e7ee7654386c2631af9ae8c9715da5efe410c85db822d5bba62bcceaac7630ed7baa5b105d6cf5c8b02bfb20c
+  metadata.gz: 274e3ce6355a84fabeee3178ae3d80fd845d0033488646cd21fe65acd96a686689ed0d1fa4606f1dc25eaa0ecddfb839322ce17c9c18a30866d66bb7a92ee752
+  data.tar.gz: 8ea19408ea53806d5dff19e3171879be01637e5f8570f27b1222238686eda0fdc16537dc0b1520598dd69ecc44295816d2adaf048d30b496a5a839a8c1cdafc2

data/exe/palletjack2knot1

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+
+require 'palletjack2zones'
+
+# Write DNS server zone files from a Palletjack warehouse, with
+# configuration for a Knot 1.x server.
+class PalletJack2Knot1 < PalletJack2Zones
+  def toolname
+    'palletjack2knot1'
+  end
+
+  def zone_config(zone)
+    "
+#{zone} {
+  file \"zones/#{zone}.zone\";
+}
+"
+  end
+end
+
+if PalletJack2Knot1.standalone?(__FILE__)
+  PalletJack2Knot1.run
+end

data/exe/palletjack2knot2

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+
+require 'palletjack2zones'
+
+# Write DNS server zone files from a Palletjack warehouse, with
+# configuration for a Knot 2.x server.
+class PalletJack2Knot2 < PalletJack2Zones
+  def toolname
+    'palletjack2knot2'
+  end
+
+  def zone_config(zone)
+    "
+zone:
+  - domain: #{zone}
+"
+  end
+end
+
+if PalletJack2Knot2.standalone?(__FILE__)
+  PalletJack2Knot2.run
+end

data/{exe/palletjack2knot → lib/palletjack2zones.rb}

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-# Write DNS server zone file from a Palletjack warehouse
+# Write DNS server zone files from a Palletjack warehouse
 #
 # Data model assumptions:
 # - Each domain corresponds uniquely to one IPv4 network
@@ -10,12 +10,24 @@
 # "net.dns.alias", each of its interfaces will get that alias in its
 # own domain. Aliases explicitly specified on a single interface will
 # override this.
+#
+# To adapt this code to a specific DNS server, implement #zone_config
+# to take the name of a zone and output the configuration block for
+# telling the server about it. Also, implement #toolname to return the
+# name of the running tool.
 
 require 'palletjack/tool'
 require 'dns/zone'
 require 'ip'
 
-class PalletJack2Knot < PalletJack::Tool
+class PalletJack2Zones < PalletJack::Tool
+  def toolname
+    'PalletJack2Zones base class'
+  end
+
+  def zone_config(zone)
+  end
+
   def parse_options(opts)
     opts.banner =
 "Usage: #{$PROGRAM_NAME} -w <warehouse> -o <output directory>
@@ -30,14 +42,6 @@ Write DNS server zone files from a Palletjack warehouse"
     required_option :output
   end
 
-  def zone_config(zone)
-    "
-#{zone} {
-  file \"zones/#{zone}.zone\";
-}
-"
-  end
-
   # Generate and store forward zone data for a Pallet Jack domain
   # object.
 
@@ -171,11 +175,11 @@ Write DNS server zone files from a Palletjack warehouse"
 
   def output
     config_file :output, 'zones.conf' do |conf_file|
-      conf_file << git_header('palletjack2knot')
+      conf_file << git_header(toolname)
 
       @forward_zones.each do |domain, zone|
         config_file :zone_dir, "#{domain}.zone" do |zonefile|
-          zonefile << git_header('palletjack2knot', comment_char: ';')
+          zonefile << git_header(toolname, comment_char: ';')
           zonefile << zone.dump_pretty
           conf_file << zone_config(domain)
         end
@@ -183,7 +187,7 @@ Write DNS server zone files from a Palletjack warehouse"
 
       @reverse_zones.each do |domain, zone|
         config_file :zone_dir, "#{domain}.zone" do |zonefile|
-          zonefile << git_header('palletjack2knot', comment_char: ';')
+          zonefile << git_header(toolname, comment_char: ';')
           zonefile << zone.dump_pretty
           conf_file << zone_config(domain)
         end
@@ -191,7 +195,3 @@ Write DNS server zone files from a Palletjack warehouse"
     end
   end
 end
-
-if PalletJack2Knot.standalone?(__FILE__)
-  PalletJack2Knot.run
-end

data/palletjack-tools.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
 
   spec.platform	= Gem::Platform::RUBY
   spec.required_ruby_version = '~>2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: palletjack-tools
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.0
 platform: ruby
 authors:
 - Karl-Johan Karlsson
@@ -31,7 +31,7 @@ cert_chain:
   f8wtQllq82VF0AXUYeLtTh1f+DW3WW5BO1e2OCu5eOV7dbyaVPaNK/+rHjCN8kM/
   DGZSwUoNADmVkQ==
   -----END CERTIFICATE-----
-date: 2017-04-28 00:00:00.000000000 Z
+date: 2017-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: palletjack
@@ -39,14 +39,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: dns-zone
   requirement: !ruby/object:Gem::Requirement
@@ -168,7 +168,8 @@ executables:
 - create_system
 - dump_pallet
 - palletjack2kea
-- palletjack2knot
+- palletjack2knot1
+- palletjack2knot2
 - palletjack2pxelinux
 - palletjack2salt
 - palletjack2unbound
@@ -182,10 +183,12 @@ files:
 - exe/create_system
 - exe/dump_pallet
 - exe/palletjack2kea
-- exe/palletjack2knot
+- exe/palletjack2knot1
+- exe/palletjack2knot2
 - exe/palletjack2pxelinux
 - exe/palletjack2salt
 - exe/palletjack2unbound
+- lib/palletjack2zones.rb
 - palletjack-tools.gemspec
 homepage: https://github.com/saab-simc-admin/palletjack
 licenses: