dory 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 196d9910bf31763f06ed08499b96037f0dd48bd5
-  data.tar.gz: f769f02eb1fb2ddeef4efc47f33230702b7ab639
+  metadata.gz: f9406dd6b3ce94814c3f20b73eaf93f019bf641b
+  data.tar.gz: 46f5d75ffe41ed8b36636c43536033f33b3e9e38
 SHA512:
-  metadata.gz: 5cfb53d3a093dee270d3babbcff2d6f7cbda9d7a374e3d332c80cccfc1ab1377b0636ea137b9af4b84ae7531af2a05a9bf82a0c8a488231b215d6b887487b6ff
-  data.tar.gz: 7f70527e8e7ac8aa1bf3ea71cdca554d4b02fa07cf767ce62dcfe53d547f2b5ea693353b9b2985eca9fc242920745133ea36f3c2303696235226eba7df7d9a15
+  metadata.gz: 2b9f8df7b16d6a5871f96632872f3dee085f7bbf80f2ed31761df7da7b701631f8ee925b6c787d0f08dbbd6e80e88dbd05204921f1e25a861a03ca612c3510bf
+  data.tar.gz: d00f0d92c7d1fcb7d785bc80051e51a769df70b0260fa4845270a9575f7321a908ba0b58a27f07735f818463642e71c0d67f06dad9af2d17263c4ef5c914389f

data/lib/dory/config.rb

@@ -25,6 +25,7 @@ module Dory
           :nginx_proxy:
             :enabled: true
             :container_name: dory_dinghy_http_proxy
+            :ssl_certs_dir: ''  # leave as empty string to disable
           :resolv:
             :enabled: true
             :nameserver: 127.0.0.1
@@ -37,18 +38,24 @@ module Dory
 
     def self.settings(filename = self.filename)
       if File.exist?(filename)
-        self.default_settings.merge(YAML.load_file(filename))
+        default_settings = self.default_settings.dup
+        config_file_settings = YAML.load_file(filename)
+        [:dnsmasq, :nginx_proxy, :resolv].each do |service|
+          default_settings[:dory][service].merge!(config_file_settings[:dory][service] || {})
+        end
+        default_settings
       else
         self.default_settings
       end
     end
 
-    def self.write_settings(settings, filename = self.filename)
+    def self.write_settings(settings, filename = self.filename, is_yaml: false)
+      settings = settings.to_yaml unless is_yaml
       File.write(filename, settings)
     end
 
     def self.write_default_settings_file(filename = self.filename)
-      self.write_settings(self.default_yaml, filename)
+      self.write_settings(self.default_yaml, filename, is_yaml: true)
     end
   end
 end

data/lib/dory/proxy.rb

@@ -12,8 +12,18 @@ module Dory
       Dory::Config.settings[:dory][:nginx_proxy][:container_name]
     end
 
+    def self.certs_arg
+      certs_dir = Dory::Config.settings[:dory][:nginx_proxy][:ssl_certs_dir]
+      if certs_dir && !certs_dir.empty?
+        "-v #{certs_dir}:/etc/nginx/certs"
+      else
+        ''
+      end
+    end
+
     def self.run_cmd
-      "docker run -d -p 80:80 -v /var/run/docker.sock:/tmp/docker.sock -e " \
+      "docker run -d -p 80:80 -v /var/run/docker.sock:/tmp/docker.sock "\
+        "#{self.certs_arg} -e " \
         "'CONTAINER_NAME=#{Shellwords.escape(self.container_name)}' --name " \
         "'#{Shellwords.escape(self.container_name)}' " \
         "#{Shellwords.escape(dinghy_http_proxy_image_name)}"

data/lib/dory/version.rb

@@ -1,3 +1,3 @@
 module Dory
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dory
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Ben Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -138,9 +138,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: slackbot_frd provides a dirt-simple framework for implementing one or more
   slack bots
 test_files: []
+has_rdoc: