letsencrypt_standalone 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26fec214a144f113adc3a955e996d5979dbd617c
-  data.tar.gz: 5fec46b41eb100b8eebf6956c64f4b19d53c2b83
+  metadata.gz: 532fe44ddaec7c12f52b3843963397ee53e25531
+  data.tar.gz: 5bad014ea44b654acf17119ce877937345fbe817
 SHA512:
-  metadata.gz: 6120ce8242e00d8fe3056ac3ae22c51fb0b643f487a3d3eef7661a03499bbde551ee3930fed3ec735935247e966fe244bd88cfbf7e2763bddf847bd8f3620655
-  data.tar.gz: 329b84e55168d26c79ec1282e988b5f567cf98a8384661ddcaf1ef5f6d8cc4d043850dfe529e629f73e7686afdf8a239a391d2c3404c7b49726444726c61f1a2
+  metadata.gz: 7ddf0a7b703621ac5db86e33c9febf6e7397ebc861dfeb7fca1e6e54ee8bbe47ea773d4de9452e35cf2ab8fd81b2734e5a43b16997f4ba196a0b26bbe838a05c
+  data.tar.gz: f99d8e96ee809b6578859f7072a2386475a99253458669f00b715a0f4c7ed9ea696df4abeebeb11aef14fb5739c5334266939ce2c2f021a5262d77c1c8cdb1f9

data/exe/le_standalone

@@ -11,14 +11,14 @@ require 'letsencrypt_standalone'
 logger = LetsencryptStandalone::Base.logger
 
 # Default config
-config_file = 'le_standalone.json'
 options = {}
+options[:config_file] = 'le_standalone.json'
 
 OptionParser.new do |opts|
   opts.banner = "le_standalone [options]"
 
   opts.on("-c", "--config File", String, "Path to config file. Default: ./le_standalone.json") do |item|
-    config_file = item
+    options[:config_file] = item
   end
 
   opts.on("-p", "--port N", Integer, "Port. Default: 12080") do |port|
@@ -48,10 +48,10 @@ end.parse!
 begin
 
   # Config
-  config      = LetsencryptStandalone::Config.new(config_file: config_file)
+  config      = LetsencryptStandalone::Config.new(config_file: options[:config_file])
   config.port = options[:port].nil? ? 12080 : options[:port]
   config.add(domains: options[:domains]) if options[:domains]
-
+p options
   # Webrick conf
   FileUtils.mkdir_p(config.www_root)
 

data/lib/letsencrypt_standalone/base.rb

@@ -24,11 +24,11 @@ module LetsencryptStandalone
     end
 
     def ssl_subdir
-      @ssl_subdir ||= LetsencryptStandalone::Config.new.ssl_subdir
+      @ssl_subdir ||= LetsencryptStandalone::Config.ssl_subdir
     end
 
     def path
-      @path ||= LetsencryptStandalone::Config.new.config[:path]
+      @path ||= LetsencryptStandalone::Config.config[:path]
     end
   end
 end

data/lib/letsencrypt_standalone/config.rb

@@ -2,10 +2,11 @@ require 'letsencrypt_standalone'
 
 module LetsencryptStandalone
   class Config < Base
+    @@config = nil
     attr_accessor :config, :location, :port
     def initialize(config_file: nil)
       @location ||= config_file
-      @config = JSON.parse(File.read(@location), :symbolize_names => true)
+      @@config ||= JSON.parse(File.read(@location), :symbolize_names => true)
     end
 
     def output_dir
@@ -18,6 +19,10 @@ module LetsencryptStandalone
       end
     end
 
+    def config
+      @@config
+    end
+
     def ssl_subdir
       config[:ssl_subdir] || 'ssl_certs'
     end
@@ -32,7 +37,7 @@ module LetsencryptStandalone
 
     def add(domains:)
       domains.each do |domain|
-        @config[:domains] << {host: domain}
+        @@config[:domains] << {host: domain}
       end
     end
 
@@ -51,5 +56,15 @@ module LetsencryptStandalone
     def write
       File.new(location, 'w').write(JSON.pretty_generate(config))
     end
+
+    class << self
+      def config
+        @@config
+      end
+
+      def ssl_subdir
+        @@config[:ssl_subdir] || 'ssl_certs'
+      end
+    end
   end
 end

data/lib/letsencrypt_standalone/version.rb

@@ -1,3 +1,3 @@
 module LetsencryptStandalone
-  VERSION = "0.1.12"
+  VERSION = "0.1.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: letsencrypt_standalone
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Grigory Aksentyev