lib/textbringer/commands/server.rb in textbringer-1.1.0 vs lib/textbringer/commands/server.rb in textbringer-1.1.1

@@ -4,10 +4,10 @@
   module Commands
     define_command(:server_start,
                    doc: "Start Textbringer server.") do
       uri = CONFIG[:server_uri] ||
         "drbunix:" + File.expand_path("server.sock", "~/.textbringer")
-      options = CONFIG[:server_options] || { UNIXFileMode: 0600 }
+      options = { UNIXFileMode: 0600 }.merge(CONFIG[:server_options] || {})
       DRb.start_service(uri, Server.new, options)
     end
 
     define_command(:server_kill,
                    doc: "Kill Textbringer server.") do