clusterlb 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce064ef74d1b87918400646ceb0b5b85a9353339a1ce13e4d2fb4858d169310c
-  data.tar.gz: 9c94e250eb691904d98ff15e1b76d3703f618bcbd5d3a12cf58549c64e2ee2ba
+  metadata.gz: cfd447af6c80b0b0bb06c5b32b20d2effca39ce0b2bac6de7b24310167873768
+  data.tar.gz: c5cecdbd2b3b591d667442ba103ad64537248e06ff15fc6ab971b3d072a82d97
 SHA512:
-  metadata.gz: bb1b0a0eb99ce75063407ebff061e5944135e1989abe41d72c7b706c638042c62cbe8a86c71739f0341a8b2a6cffbbe785f1f307e07da8ed1f49f505d337b0d0
-  data.tar.gz: 0bab7c6ec321568f06640bf0fe9f5a87ddc9cd67eaf17dc41f3ec5ad6b0ba6aa4b07e00806c11c46fc721474d100744feec7d23e246a87feb8efaa3caaa81aa0
+  metadata.gz: 5b9312191c06f47a309d98189a0d603bcb3afed75242e3b6165be8c2c17c1e32675a65b91fadc4e44e0edc9018be8ae522dc22532eae5d4926771f04370be2ff
+  data.tar.gz: e2a7545a6b5a230d6c94f1d8ce338f8df154bf5b4b7ba6ed9262d8f00ec3954f006890f4a9037fa49471be6ea84cf36be8adfabeff27e2734f599c570f29cfd5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    clusterlb (0.1.10)
+    clusterlb (0.1.11)
       aws-sdk (~> 3.0, >= 3.0.1)
       colorize (~> 0.8.1)
       console_table (~> 0.3.0)
@@ -14,7 +14,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     aws-eventstream (1.0.3)
-    aws-partitions (1.184.0)
+    aws-partitions (1.186.0)
     aws-sdk (3.0.1)
       aws-sdk-resources (~> 3)
     aws-sdk-acm (1.24.0)
@@ -26,7 +26,7 @@ GEM
     aws-sdk-alexaforbusiness (1.28.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-amplify (1.8.0)
+    aws-sdk-amplify (1.9.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-apigateway (1.33.0)
@@ -104,7 +104,7 @@ GEM
     aws-sdk-cloudtrail (1.16.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatch (1.25.0)
+    aws-sdk-cloudwatch (1.26.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-cloudwatchevents (1.22.0)
@@ -143,7 +143,7 @@ GEM
     aws-sdk-comprehendmedical (1.8.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-configservice (1.32.0)
+    aws-sdk-configservice (1.33.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-connect (1.18.0)
@@ -157,7 +157,7 @@ GEM
     aws-sdk-costandusagereportservice (1.15.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-costexplorer (1.26.0)
+    aws-sdk-costexplorer (1.27.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-databasemigrationservice (1.25.0)
@@ -205,7 +205,7 @@ GEM
     aws-sdk-ecs (1.43.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-efs (1.19.0)
+    aws-sdk-efs (1.20.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-eks (1.23.0)
@@ -241,7 +241,7 @@ GEM
     aws-sdk-fsx (1.10.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-gamelift (1.21.0)
+    aws-sdk-gamelift (1.22.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-glacier (1.23.0)
@@ -313,10 +313,10 @@ GEM
     aws-sdk-kinesisanalyticsv2 (1.9.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kinesisvideo (1.17.0)
+    aws-sdk-kinesisvideo (1.18.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kinesisvideoarchivedmedia (1.16.0)
+    aws-sdk-kinesisvideoarchivedmedia (1.17.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-kinesisvideomedia (1.16.0)
@@ -743,10 +743,10 @@ GEM
     aws-sdk-translate (1.16.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-waf (1.22.0)
+    aws-sdk-waf (1.23.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-wafregional (1.23.0)
+    aws-sdk-wafregional (1.24.0)
       aws-sdk-core (~> 3, >= 3.58.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-workdocs (1.17.0)

data/exe/clusterlb-getcert

@@ -40,9 +40,9 @@ def parse_cli
 		when "-s" || "--s3"
 			@mode="s3"
     when "-l" || "--letsencrypt"
-      display_help; exit
+      @mode="le"
     when "-r" || "--renew-all-letsencrypt"
-			display_help; exit
+			@mode="le_all"
 		when "-f" || "--fqdn"
 			@fqdn = arg.strip().downcase();
     end
@@ -55,4 +55,10 @@ parse_cli
 if @mode == "s3"
 	Clusterlb.get_s3_cert(@fqdn)
 	exit
+elsif @mode == "le_all"
+	Clusterlb.letsEncrypt("all")
+	exit
+elsif @mode == "le"
+		Clusterlb.letsEncrypt(@fqdn)
+		exit
 end

data/exe/clusterlb-nginx

@@ -8,6 +8,7 @@ include Clusterlb
 
 def display_help
 	@node=nil
+	@mode=nil
 
 	puts
   puts "Nginx tool"
@@ -49,7 +50,10 @@ end
 
 parse_cli
 
-if @node.nil?
+if @mode.nil? && @node.nil?
+	display_help
+	exit 1
+elsif @node.nil?
 	Clusterlb.cmd_nginx(@mode,"all")
 else
 	Clusterlb.cmd_nginx(@mode,@node)

data/lib/clusterlb/version.rb

@@ -1,3 +1,3 @@
 module Clusterlb
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

data/lib/clusterlb.rb

@@ -78,6 +78,43 @@ module Clusterlb
     })
   end
 
+  # :LetsEncrypt => {
+  #   :sites_enabled => [],
+  #   :challange_dir => "LetsEncrypt/challage",
+  #   :certificates_dir => "LetsEncrypt/certs",
+  #   :acme_home_dir => "LetsEncrypt/.acme.sh",
+  #   :acme_bin => "/srv/lb-config/lets-encrypt/.acme.sh"
+  # }
+  def letsEncrypt(fqdn) # fqdn | all
+    if fqdn == "all" && config["LetsEncrypt"]["sites_enabled"].count > 0
+      config["LetsEncrypt"]["sites_enabled"].each do |site|
+        letsEncrypt_getCert(site)
+      end
+      cmd_nginx("reload","all")
+    else
+      letsEncrypt_getCert(fqdn)
+      cmd_nginx("reload","all")
+    end
+
+  end
+
+
+  def letsEncrypt_getCert(fqdn)
+    le_env = {
+      "le_challange_dir" => "#{ENV["CLUSTERLB_HOME"]}/#{config["LetsEncrypt"]["challange_dir"]}",
+      "le_cert_dir"      => config["LetsEncrypt"]["certificates_dir"],
+      "acme"             => config["LetsEncrypt"]["acme_bin"],
+      "le_home"          => "#{ENV["CLUSTERLB_HOME"]}/#{config["LetsEncrypt"]["acme_home_dir"]}",
+    }
+    puts "Trying to renew Certificate: #{site}".colorize(:light_blue)
+    cmd = "sudo ${acme} --cron --home \"${le_home}\" --issue  -d ${1} -w ${le_challange_dir} \
+            --cert-file ${le_cert_dir}/#{site}.pem \
+            --key-file  ${le_cert_dir}/#{site}.key \
+            --fullchain-file ${le_cert_dir}/#{site}.full.pem"
+    system(le_env, cmd)
+    puts "--\n".colorize(:light_blue)
+  end
+
   def get_s3_cert(fqdn)
 
     ensure_dir_exitsts
@@ -209,7 +246,8 @@ module Clusterlb
         :sites_enabled => [],
         :challange_dir => "LetsEncrypt/challage",
         :certificates_dir => "LetsEncrypt/certs",
-        :acme_home_dir => "LetsEncrypt/.acme.sh"
+        :acme_home_dir => "LetsEncrypt/.acme.sh",
+        :acme_bin => "/srv/lb-config/lets-encrypt/.acme.sh"
       }
     }
     File.open(path,"w") do |f|
@@ -218,6 +256,4 @@ module Clusterlb
   end
 
 
-
-
 end

data/omnibus/config/software/clusterlb-gem.rb

@@ -1,5 +1,5 @@
 name "sensu-gem"
-default_version "0.1.10"
+default_version "0.1.11"
 
 dependency "ruby"
 dependency "ncurses"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clusterlb
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Dr. Ogg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-08 00:00:00.000000000 Z
+date: 2019-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler