dns_one 0.4.23 → 0.4.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5cb35b5104c43ec13d3da598213eec62d8fa2d5
-  data.tar.gz: d332ea5cc00a4aa2cc313203e013b1651147c25a
+  metadata.gz: 77fd667f7117637e11933cd243928f1a0642220a
+  data.tar.gz: fcc9de0cf0843db0f7d76560bedabea8e5e13576
 SHA512:
-  metadata.gz: e780b6cb698f972161400c5b2a28f73674739831fb6cd11e986686380335f9bcb317bfc4921cef7fdb63cc1b2ca80efe8fd51ededd0769c2c6f9f020a7f9f622
-  data.tar.gz: e6fa0be1ecf1cd19888074459b5f890061b7a8f78a7b45093e249d1cc783116ee5be40663463b35a67f061518fcaddd288ed5ae3d02653c54cd846f959a8fdf6
+  metadata.gz: f29ab0a236819c202ec1eec373fc24c3e7e4ddc49f06aa9f87a2600f056200b5721ed7fb1b9904cebe811beac0ad3c1664f0b9854b3a34adfc49087937798597
+  data.tar.gz: 22a61d2f79b2b1d89a1152e21ebe3f2af10b7367f22a2887670d6d0d323f9526ecdf45e08aacc92e887290c49184bd87157fbf85e53521fbbb04162a728aba22

data/README.md

@@ -6,9 +6,9 @@
  
 By [Bettercall.io](https://bettercall.io/).
 
-Instead having a complex data schema to assign record sets to individual DNS zones, dns_one assigns one or few record to many zones.  
+Instead having a complex data schema to assign record sets to DNS zones, dns_one assigns one or a few record sets to many zones.
 
-Configure your zones in YML files and fetch your domains from a database or YML backend.
+Configure your record sets in YML files and fetch your domains from a database or YML backend.
 
 ## Installation
 

data/dns_one.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["tomlobato@gmail.com"]
 
   spec.summary       = %q{DNS server for many zones sharing only one or few records, written in Ruby.}
-  spec.description   = %q{Instead having a complex data schema to assign record sets to individual DNS zones, dns_one assigns one or few record to many zones. Configure your zones in YML files and fetch your domains from a database or YML backend.}
+  spec.description   = %q{Instead having a complex data schema to assign record sets to DNS zones, dns_one assigns one or a few record sets to many zones. Configure your record sets in YML files and fetch your domains from a database or YML backend.}
   spec.homepage      = "https://tomlobato.github.io/dns_one/"
   spec.license       = "MIT"
 

data/lib/dns_one/backend/db.rb

@@ -1,4 +1,6 @@
-module Backend; class BackendDB
+
+module DnsOne; module Backend; class DB
+
     def initialize conf
         @query = conf.delete :query
         @conf = conf
@@ -18,13 +20,13 @@ module Backend; class BackendDB
             end
 
         rescue ActiveRecord::StatementInvalid => e
-            Log.e "Query error. Trying to reconnect. Details:\n#{e.desc}"
+            Log.e "SQL query error. Trying to reconnect #{tries}. Details:\n#{e.desc}"
             # http://geoff.evason.name/2015/01/18/postgres-ssl-connection-has-been-closed-unexpectedly
             ActiveRecord::Base.connection.reconnect! 
             find dom_name, (tries+1)
 
         rescue => e
-            Log.exc e
+            Log.e "SQL query error. Details:\n#{e.desc}"
         end
 
         first_record = res&.first
@@ -68,4 +70,4 @@ module Backend; class BackendDB
         end
     end
   
-end; end
+end; end; end

data/lib/dns_one/backend/file.rb

@@ -1,5 +1,6 @@
 
-module Backend; class BackendFile
+module DnsOne; module Backend; class File
+
     def initialize file
         @domain_map = {}
         load file
@@ -16,7 +17,7 @@ module Backend; class BackendFile
     private
 
     def load file
-        File.open(file).each_line do |line|
+        ::File.open(file).each_line do |line|
             line.strip!
             domain_name, rec_set_name = line
                 .split(/[,\s]+/)
@@ -28,4 +29,4 @@ module Backend; class BackendFile
         end
     end
 
-end; end
+end; end; end

data/lib/dns_one/cli.rb

@@ -5,6 +5,8 @@ require "dns_one/setup"
 
 class DnsOne::CLI < Thor  
 
+    default_task :run_srv
+
     # RUN
 
     desc "run", "run server"
@@ -12,9 +14,12 @@ class DnsOne::CLI < Thor
     option :log
     option :work_dir
     def run_srv
-        DnsOne::DnsOne.new(conf_file: options[:conf], log_file: options[:log], work_dir: options[:work_dir]).start 
+        DnsOne::DnsOne.new(
+            conf_file: options[:conf], 
+            log_file: options[:log], 
+            work_dir: options[:work_dir]
+        ).start 
     end
-    default_task :run_srv
 
     # INSTALL
 

data/lib/dns_one/core_ext/hash.rb

@@ -0,0 +1,5 @@
+class Hash
+    def symbolize_keys
+        each_with_object({}) { |(k, v), h| h[k.to_sym] = v.is_a?(Hash) ? v.symbolize_keys : v }
+    end
+end

data/lib/dns_one/server.rb

@@ -1,5 +1,7 @@
 
-module DnsOne; class Server # < RExec::Daemon::Base
+require "dns_one/zone_search"
+
+module DnsOne; class Server
 
     DEFAULT_RUN_AS = "dnsone"
 

data/lib/dns_one/setup.rb

@@ -71,7 +71,7 @@ module DnsOne; class Setup
         puts "Now:"
         puts "1) Edit #{DnsOne::DEFAULT_CONF_FILE}. You can run 'ruby -Ilib/ exe/dns_one --conf util/dev_conf.yml --log=/dev/stdout' to test and adjust your configuration."
         puts "2) After configure run 'dns_one start'."
-        puts "See startup or logs with 'tail -f /var/log/syslog'"
+        puts "See startup logs with 'tail -f /var/log/syslog'"
         puts "See run logs with 'tail -f #{DnsOne::DEFAULT_LOG_FILE}'"
     end
 

data/lib/dns_one/version.rb

@@ -1,3 +1,3 @@
 module DnsOne
-    VERSION = "0.4.23"
+    VERSION = "0.4.24"
 end

data/lib/dns_one/zone_search.rb

@@ -1,4 +1,8 @@
 
+require "dns_one/cache"
+require 'dns_one/backend/file'
+require 'dns_one/backend/db'
+
 module DnsOne; class ZoneSearch
     include Singleton
     
@@ -26,7 +30,7 @@ module DnsOne; class ZoneSearch
         records = []
 
         rec_set_name = find_record_set dom_name
-        Log.d "domain #{ rec_set_name ? 'found' : 'not found' }"
+        Log.d "domain #{ rec_set_name ? "found, rec_set_name = '#{rec_set_name}'" : 'not found' }"
         return unless rec_set_name
 
         # use first record set if rec_set_name == ''
@@ -71,12 +75,12 @@ module DnsOne; class ZoneSearch
 
     def set_backend
         if file = @conf[:backend][:file]
-            unless File.exists? file
+            unless ::File.exists? file
                 Util.die "Domain list file #{file} not found."
             end
-            Backend::BackendFile.new file          
+            Backend::File.new file          
         else
-            Backend::BackendDB.new @conf[:backend]
+            Backend::DB.new @conf[:backend]
         end
     end
 

data/lib/dns_one.rb

@@ -2,108 +2,99 @@
 require 'syslog'
 require 'syslog/logger'
 require 'ostruct'
-require 'yaml'
 require 'singleton'
 
 # Gems
 require 'rexec'
 require 'rubydns'
+require 'yaml'
 
 # DnsOne
 
 require "dns_one/core_ext/exception"
 require "dns_one/core_ext/string"
 require "dns_one/core_ext/blank"
+require "dns_one/core_ext/hash"
 
 require "dns_one/log"
 require "dns_one/util"
-
 require "dns_one/server"
-require "dns_one/setup"
-require "dns_one/cache"
-require "dns_one/zone_search"
-
-require 'dns_one/backend/file'
-require 'dns_one/backend/db'
 
 module DnsOne; class DnsOne
 
-	DEFAULT_LOG_FILE = "/var/log/dns_one.log"
-	DEFAULT_CONF_FILE = '/etc/dns_one/conf.yml'
-	WORK_DIR = "/var/local/dns_one"
-
-	CONF_DIR = "/etc/dns_one"
-	SYSLOG_NAME = 'dns_one'
-
-	def initialize conf_file: nil, log_file: nil, work_dir: nil
-		cmd_log_file = log_file
-		log_file ||= DEFAULT_LOG_FILE
-		Log.setup log_file, SYSLOG_NAME
-
-		conf_file ||= DEFAULT_CONF_FILE
-		@conf_all = parse_conf conf_file
-		@conf = @conf_all.main
-
-		work_dir ||= WORK_DIR
-
-		# Redefine log file if set in conf file
-		unless cmd_log_file
-			if f = @conf[:log_file].presence 
-				unless Log.change_log_file f
-					Log.w "Unable to change logfile to #{f}. Will continue with #{Log.log_file_desc}."
-				end
-			end
-		end
-
-		begin
-			Dir.chdir work_dir
-		rescue => e
-			Log.w "Cannot change working dir to #{WORK_DIR}. Will continue in #{Dir.pwd}."
-		end
-	end
-
-	def start
-		Server.new(@conf_all.server, @conf_all.zone_search).run 
-	end
-
-	private
-def symbolize_keys(hash)
-  hash.each_with_object({}) { |(k, v), h| h[k.to_sym] = v.is_a?(Hash) ? symbolize_keys(v) : v }
-end
-	def parse_conf conf_file
-		check_conf_file conf_file
-
-		conf = YAML.load_file conf_file
-		conf = symbolize_keys conf
-
-		OpenStruct.new(
-			main: {
-				work_dir: 					conf[:config][:work_dir],
-				log_file: 					conf[:config][:log_file]
-			},
-			server: {
-				run_as: 						conf[:config][:run_as]
-			},
-			zone_search: {
-				ignore_subdomains: 	conf[:config][:ignore_subdomains],
-				cache_max: 					conf[:config][:cache_max],
-				record_sets: 				conf[:record_sets],
-				backend: 						conf[:backend]
-			}
-		)
-	end
-
-	def check_conf_file conf_file
-		unless File.readable? conf_file
-				Util.die "Conf file #{conf_file} not found or unreadable. Aborting." 
-		end
-
-		conf_stat = File.stat conf_file
-
-		unless conf_stat.mode.to_s(8) =~ /0600$/
-				Util.die "Conf file #{conf_file} must have mode 0600. Aborting." 
-		end
-	end
+    DEFAULT_LOG_FILE = "/var/log/dns_one.log"
+    DEFAULT_CONF_FILE = '/etc/dns_one/conf.yml'
+    WORK_DIR = "/var/local/dns_one"
+    CONF_DIR = "/etc/dns_one"
+    SYSLOG_NAME = 'dns_one'
+
+    def initialize conf_file: nil, log_file: nil, work_dir: nil
+        cmd_log_file = log_file
+        log_file ||= DEFAULT_LOG_FILE
+        Log.setup log_file, SYSLOG_NAME
+
+        conf_file ||= DEFAULT_CONF_FILE
+        @conf_all = parse_conf conf_file
+        @conf = @conf_all.main
+
+        work_dir ||= WORK_DIR
+
+        # Redefine log file if set in conf file
+        unless cmd_log_file
+            if f = @conf[:log_file].presence 
+                unless Log.change_log_file f
+                    Log.w "Unable to change logfile to #{f}. Will continue with #{Log.log_file_desc}."
+                end
+            end
+        end
+
+        begin
+            Dir.chdir work_dir
+        rescue => e
+            Log.w "Cannot change working dir to #{WORK_DIR}. Will continue in #{Dir.pwd}."
+        end
+    end
+
+    def start
+        Server.new(@conf_all.server, @conf_all.zone_search).run 
+    end
+
+    private
+        
+    def parse_conf conf_file
+        check_conf_file conf_file
+
+        conf = YAML.load_file conf_file
+        conf = conf.symbolize_keys
+
+        OpenStruct.new(
+            main: {
+                work_dir:           conf[:config][:work_dir],
+                log_file:           conf[:config][:log_file]
+            },
+            server: {
+                run_as:             conf[:config][:run_as]
+            },
+            zone_search: {
+                ignore_subdomains:  conf[:config][:ignore_subdomains],
+                cache_max:          conf[:config][:cache_max],
+                record_sets:        conf[:record_sets],
+                backend:            conf[:backend]
+            }
+        )
+    end
+
+    def check_conf_file conf_file
+        unless File.readable? conf_file
+                Util.die "Conf file #{conf_file} not found or unreadable. Aborting." 
+        end
+
+        conf_stat = File.stat conf_file
+
+        unless conf_stat.mode.to_s(8) =~ /0600$/
+                Util.die "Conf file #{conf_file} must have mode 0600. Aborting." 
+        end
+    end
 
 end; end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dns_one
 version: !ruby/object:Gem::Version
-  version: 0.4.23
+  version: 0.4.24
 platform: ruby
 authors:
 - Tom Lobato
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-27 00:00:00.000000000 Z
+date: 2017-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,8 +94,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-description: Instead having a complex data schema to assign record sets to individual
-  DNS zones, dns_one assigns one or few record to many zones. Configure your zones
+description: Instead having a complex data schema to assign record sets to DNS zones,
+  dns_one assigns one or a few record sets to many zones. Configure your record sets
   in YML files and fetch your domains from a database or YML backend.
 email:
 - tomlobato@gmail.com
@@ -124,6 +124,7 @@ files:
 - lib/dns_one/cli.rb
 - lib/dns_one/core_ext/blank.rb
 - lib/dns_one/core_ext/exception.rb
+- lib/dns_one/core_ext/hash.rb
 - lib/dns_one/core_ext/string.rb
 - lib/dns_one/log.rb
 - lib/dns_one/server.rb