lib/dns_one.rb in dns_one-0.4.2 vs lib/dns_one.rb in dns_one-0.4.3

@@ -1,13 +1,17 @@
+# Core
+require 'syslog'
+require 'syslog/logger'
 
+# Gems
 require 'rubydns'
 require 'active_record'
 require 'yaml'
 require 'rexec'
-require 'syslog'
-require 'syslog/logger'
 
+# DnsOne
+
 require "dns_one/core_extensions"
 require "dns_one/log"
 require "dns_one/util"
 
 require "dns_one/server"
@@ -34,11 +38,11 @@
 		Log.setup log_file, SYSLOG_NAME
 		@conf = parse_conf conf_file
 
 		# check_root
 		begin
-			Dir.chdir WORK_DIR
+			Dir.chdir (@conf.config[:work_dir] || WORK_DIR)
 		rescue => e
 			Log.w "Cannot change working dir to #{WORK_DIR}. Will continue in #{Dir.pwd}."
 		end
 	end
 
@@ -51,9 +55,11 @@
 	def parse_conf conf_file
 		check_conf_file conf_file
 
 		conf = YAML.load_file conf_file
 		conf.deep_symbolize_keys!
+
+		conf[:config] ||= {}
 
 		OpenStruct.new conf
 	end
 
 	def check_conf_file conf_file