dns_one 0.5.12 → 0.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f81dde3459b31d4c83ba7bb115f03a1ed708b21d
-  data.tar.gz: bb87f0b070fda97d18cfc9923657619d99c257e4
+  metadata.gz: 2e10df9846e483364575b961388bc6836684c112
+  data.tar.gz: 81347e9f92e59419489a07f0a727654fce46d166
 SHA512:
-  metadata.gz: 91830beaf2f9d7b72ae7b77e2d384b6d53701ee9f99337fa2845c6ea8c0657799ad2017e693164add1b3da7f1e84bff3648a6aa7cf1411e1b65ce4c082c88428
-  data.tar.gz: b85b09c99d752241540905b2f578b7e59bc72f61a5e60426677dbbbcb0c46b3c8092d85aa21ed7ae4716b19a7e6917f5e7e5a7f47f2b35836259dbd0b7392bb5
+  metadata.gz: c3473af08292f70ff5558b6d0bba02daa508580bedc5d8659b4e73de50cb21ea0841ffac7a78103aabd88904a0f81b90553caccb35912e7d6d8f8c15c6f1a938
+  data.tar.gz: ccef86c94a4e2046cf89d466ec4cec5a944e8c23613d6f81c2133e967c64f8d9c29a7d3a8a8083255910cf5d8205e1a2b6bd87a1ea0ff7ca26662b6af7bbc286

data/dns_one.gemspec

@@ -28,8 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "thor", '~> 0.19'
   spec.add_runtime_dependency "rubydns", '~> 2.0'
   spec.add_runtime_dependency "rexec", '~> 1.6'
-  spec.add_runtime_dependency "pg", '~> 0.21'
-  spec.add_runtime_dependency "activerecord", '~> 5.0'
-  spec.add_runtime_dependency "sqlite3", '~> 1.3'
 
 end

data/lib/dns_one.rb

@@ -23,22 +23,21 @@ require "dns_one/core_ext/hash"
 require "dns_one/global"
 require "dns_one/util"
 require "dns_one/server"
-require "dns_one/req_log/db"
 
 module DnsOne; class DnsOne
 
     DEFAULTS = {
-        conf_file:          "/etc/dns_one.yml",
-        work_dir:           "/var/local/dns_one",
-        log_file:           "/var/log/dns_one/dns_one.log",
-        rubydns_log_file:   "/var/log/dns_one/dns_one_rubydns.log",
+        conf_file:          "/etc/dnsone.yml",
+        work_dir:           "/var/local/dnsone",
+        log_file:           "/var/log/dns_one/dnsone.log",
+        rubydns_log_file:   "/var/log/dns_one/dnsone_rubydns.log",
         run_as:             "dnsone",
         interfaces:         [ [:udp, "0.0.0.0", 53],
                               [:tcp, "0.0.0.0", 53],
                               [:udp, "::", 5300],
                               [:tcp, "::", 5300] 
                             ],
-        log_req_socket_file: '/tmp/dns_one_log_result.sock'
+        log_req_socket_file: '/tmp/dnsone_log_result.sock'
     }
 
     def initialize conf_file: nil
@@ -55,7 +54,9 @@ module DnsOne; class DnsOne
 
     def load_conf conf_file
         conf = DEFAULTS.clone
-        conf.merge! YAML.load_file(conf_file).symbolize_keys
+        if File.exists? conf_file
+            conf.merge! YAML.load_file(conf_file).symbolize_keys
+        end
         Util.hash_to_ostruct_deep conf
 
     rescue => e

data/lib/dns_one/backend/db.rb

@@ -1,4 +1,3 @@
-
 module DnsOne; module Backend; class DB < Base
 
     def initialize conf
@@ -45,7 +44,7 @@ module DnsOne; module Backend; class DB < Base
     end
 
     def setup_db
-        #require_deps
+        require_deps
         ActiveRecord::Base.logger = Global.logger
         ActiveRecord::Base.establish_connection @conf
     end

data/lib/dns_one/cli.rb

@@ -18,40 +18,16 @@ class DnsOne::CLI < Thor
         ).start 
     end
 
-    # INSTALL
-
-    desc "install", "install dns_one"
-    def install
-        DnsOne::Setup.new.install
+    desc "setup", "setup dnsone"
+    def setup
+        DnsOne::Setup.new.setup
     end
 
-    desc "uninstall", "uninstall dns_one"
-    def uninstall
-        DnsOne::Setup.new.uninstall
+    desc "remove", "remove dnsone"
+    def remove
+        DnsOne::Setup.new.remove
     end
 
-    # MANAGE
-
-    desc "start", "start dns_one"
-    def start
-        DnsOne::Util.ensure_sytemd
-        DnsOne::Util.run "systemctl start #{DnsOne::Setup::SERVICE_NAME}"
-    end
-
-    desc "stop", "stop dns_one"
-    def stop
-        DnsOne::Util.ensure_sytemd
-        DnsOne::Util.run "systemctl stop #{DnsOne::Setup::SERVICE_NAME}"
-    end
-
-    desc "status", "check dns_one status"
-    def status
-        DnsOne::Util.ensure_sytemd
-        DnsOne::Util.run "systemctl status #{DnsOne::Setup::SERVICE_NAME}"
-    end
-
-    # STATS
-
     desc "stats", "show counters"
     def stats
         DnsOne::Stat.print

data/lib/dns_one/req_log/db.rb

@@ -1,4 +1,4 @@
-module DnsOne; module Backend; class DB
+module DnsOne; module ReqLog; class DB
 
     DB_FNAME = "stat.db"
     META_STAT_ON = false

data/lib/dns_one/req_log/file.rb

@@ -1,8 +1,10 @@
-module DnsOne; module Backend; class File
-    if @conf.req_log_file
-        path = @conf.req_log_file.is_a?(String) ? @conf.req_log_file : 
+module DnsOne; module ReqLog; class File
+    if  self.set_logger
+        path = @conf.req_log_file.is_a?(String) ? @conf.req_log_file : STDOUT
+
         l = Logger.new @conf.ruby_dns_logger, 10, (10 * 2**20)
         l.level = Logger::WARN
+
         Global.ruby_dns_logger = l
     end
 

data/lib/dns_one/server.rb

@@ -2,6 +2,7 @@
 require "dns_one/zone_search"
 require "dns_one/req_log/req_log"
 require "dns_one/req_log/account"
+require "dns_one/req_log/db"
 
 module DnsOne; class Server
     def initialize 

data/lib/dns_one/setup.rb

@@ -1,115 +1,151 @@
 module DnsOne; class Setup
-    # Currently tested version 
-    # TODO: flexibilize version and make checks/prompts/warnings during install
-    REQUIRED_RUBY_VERSION = '2.3.3' 
-
     SYSTEMD_SERVICES_DIR = "/lib/systemd/system/"
-    SERVICE_NAME = 'dns_one'
+    SERVICE_NAME = 'dnsone'
     SYSTEMD_SERVICE_FILE = "#{SYSTEMD_SERVICES_DIR}/#{SERVICE_NAME}.service"
 
+    attr_accessor :conf
 
     def initialize
         @thisdir = File.join File.dirname(__FILE__)
+        DnsOne.new # just to load the configuration 
+                   # TODO: move conf to own class
+        @conf = Global.conf
     end
 
-    def install
-        check_root
-        #check_ruby_version
-        unless Util.has_systemd?
-            STDERR.puts "DnsOne requires systemd. Aborting install."
-            exit 1
-        end
+    def setup
+        check_reqs
         add_user
         mkdirs
-        #set_ruby_version
         copy_sample_conf
         install_systemd_service
         setup_finished_msg
     end
 
-    def uninstall
-        # File.delete DnsOne::DEFAULT_CONF_FILE # TODO: prompt user
-        if File.exist?(SYSTEMD_SERVICE_FILE)
+    def remove
+        unless is_setup?
+            die "Nothing to remove. Exiting."
+        end
+
+        # SYSTEMD_SERVICE_FILE
+        if Util.has_systemd? and File.exist? SYSTEMD_SERVICE_FILE 
             Util.run "systemctl stop #{SERVICE_NAME}" 
             Util.run "systemctl disable #{SERVICE_NAME}" 
             File.delete SYSTEMD_SERVICE_FILE
         end
-        FileUtils.rm_rf DnsOne::WORK_DIR
-        # TODO: prompt if should remove user
-        puts "Uninstall complete."
+        
+        # conf_file
+        if File.exists? conf.conf_file
+            if confirm? "Delete #{conf.conf_file}?"
+                FileUtils.rm conf.conf_file
+            end
+        end
+        
+        # work_dir
+        if conf.work_dir == '/var/local/dnsone' # Only deletes if path matches the hardcoded one
+            if Dir.exists? conf.work_dir
+                if confirm? "Delete #{conf.work_dir}?"
+                    FileUtils.rm_rf conf.work_dir
+                end
+            end
+        end
+
+        puts "Removed."
     end
 
     private
 
-    def check_ruby_version
-        if RUBY_VERSION != REQUIRED_RUBY_VERSION
-            STDERR.puts "Currently dns_one supports #{REQUIRED_RUBY_VERSION} only. Aborting install."
-            exit 1
+    def check_reqs
+        unless Process.uid == 0
+            die  "Install requires root privileges. Run with sudo or login as root. Aborting."
+        end
+        unless Util.has_systemd?
+            warn "DnsOne will install without systemd."
         end
     end
 
     def add_user
-        if `cat /etc/passwd|grep ^#{Server::DEFAULT_RUN_AS}:`.strip.present?
-            STDOUT.puts "User #{Server::DEFAULT_RUN_AS} exists, skipping creation."            
-        else
-            # TODO: prompt user
-            system "adduser --system --no-create-home #{Server::DEFAULT_RUN_AS}"
+        if `cat /etc/passwd|grep ^#{conf.run_as}:`.strip.present?
+            warn "User #{conf.run_as} exists, skipping creation."
+            return
         end
-    end
-
-    def set_ruby_version
-        File.write "#{DnsOne::WORK_DIR}/.ruby-version", REQUIRED_RUBY_VERSION
+        system "adduser --system --no-create-home '#{conf.run_as}'"
     end
 
     def mkdirs
-        FileUtils.mkdir_p DnsOne::CONF_DIR
-
-        FileUtils.mkdir_p DnsOne::WORK_DIR
-        File.chmod 0755, DnsOne::WORK_DIR
-        File.chown `id -u #{Server::DEFAULT_RUN_AS}`.to_i, nil, DnsOne::WORK_DIR
+        if Dir.exists? conf.work_dir
+            warn "Work dir #{conf.work_dir} exists, skipping creation."
+            return
+        end
+        FileUtils.mkdir_p conf.work_dir
+        File.chmod 0755, conf.work_dir
+        File.chown `id -u #{conf.run_as}`.to_i, nil, conf.work_dir
     end
 
     def setup_finished_msg
-        puts "Installed.\n"
-        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 logs with 'tail -f /var/log/syslog'"
-        puts "See run logs with 'tail -f /var/log/dns_one.log' (or /var/log/dns_one_rubydns.log)"
-    end
+        print <<~HEREDOC
 
-    def is_setup?
-        File.exist?(DnsOne::DEFAULT_CONF_FILE) &&
-        File.exist?(SYSTEMD_SERVICE_FILE)
+            Installed successfully
+
+            Now:
+            1) Edit #{conf.conf_file}
+            2) After configuration run 'dnsone' (or 'systemctl start dnsone' if systemd is available)
+
+            Logs are sent to /var/log/dnsone.log 
+                             /var/log/dnsone_rubydns.log
+
+        HEREDOC
     end
 
-    def check_root
-        unless Process.uid == 0
-            STDERR.puts "Install requires root privileges. Run with sudo or login as root. Aborting."
-            exit 1
-        end
+    def is_setup?
+        File.exist? conf.conf_file
     end
 
     def install_systemd_service
-        copy "#{@thisdir}/../../util/dns_one.service", 
+        copy "#{@thisdir}/../../util/dnsone.service", 
              SYSTEMD_SERVICE_FILE
 
         Util.run "systemctl enable #{SERVICE_NAME}"
     end
 
     def copy_sample_conf
-        if File.exist? DnsOne::DEFAULT_CONF_FILE
-            STDOUT.puts "File #{DnsOne::DEFAULT_CONF_FILE} exists, skipping creation."
-        else
-            copy "#{@thisdir}/../../util/sample_conf.yml", 
-                 DnsOne::DEFAULT_CONF_FILE
+        if File.exist? conf.conf_file
+            unless confirm? "File #{conf.conf_file} exists. Override it?"
+                return
+            end
         end
+        copy "#{@thisdir}/../../util/sample_conf.yml", 
+             conf.conf_file
     end
 
     def copy from, to, mod = 0600
         puts "Copying #{from} to #{to}..."
         FileUtils.cp from, to
         FileUtils.chmod mod, to
+    
+    rescue => e
+        warn "Error when copying #{from} to #{to}: #{e.message}"
+        unless confirm? "Ignore error?"
+            die "exiting"
+        end
+    end
+
+    def die msg
+        STDERR.puts msg
+        exit 1
+    end
+
+    def warn msg
+        STDERR.puts msg
+    end
+
+    def confirm? msg
+        typed = nil
+        loop do
+            print "#{msg} (y/n): "
+            typed = STDIN.gets.chomp
+            break if %w(y n).include? typed
+        end
+        typed == 'y'
     end
 
 end; end

data/lib/dns_one/version.rb

@@ -1,3 +1,3 @@
 module DnsOne
-    VERSION = "0.5.12"
+    VERSION = "0.5.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dns_one
 version: !ruby/object:Gem::Version
-  version: 0.5.12
+  version: 0.5.13
 platform: ruby
 authors:
 - Tom Lobato
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-29 00:00:00.000000000 Z
+date: 2018-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,48 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.21'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.21'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 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.