blix-letsencrypt 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02ba44d3482bd2db20399da7da2d3805ed631c337e64e6505c37b399eab7d1cd
-  data.tar.gz: 00fd0bd12be6948c198c408290e6898d98e0d9d33015e6c9ec7795ea9590c960
+  metadata.gz: 6f1f27590a110528eb5546250efe02efd240b3581d4090d99246e2f37718771d
+  data.tar.gz: a18a64ba2172d079994f336124d8efc0c214ec8b4ae558f37d2cf5063e991660
 SHA512:
-  metadata.gz: 7705cc16693b904a048c714574b8833754cd3e561f99ffeccfd6020853e2e55e213bb8b6f855c5753f17c5d07d21b1c53c82c4a59d9f164d5473ad63eac1dae0
-  data.tar.gz: 35e51a863e472b186b4195060049037d0619506cde4898cae9eade32f57e3e01f5eec0c4242dfe37bf231cced5782ac6db34a2c3037319347d689ed102dfce7f
+  metadata.gz: b149b0711bd839f8c147d05ac345bf2cd3ee54478416ef2a74a9d83acbfc16f49d86e4571730e8b60ab5be6bc8cc4c060e05ed635f7849396a2929b8f3bb3e2e
+  data.tar.gz: '08414622cb6b29b9ef86d77f5cb1800648d4e025279c95ec909f2c343fcb6ce9d0e41d5b0bd69e474241cfe9cd9f39977db4173b12cb93b082f90fd0fa79c506'

data/README.md

@@ -13,18 +13,19 @@ gem install blix-letsencrypt
 
 ## command options:
 
-		Usage: letsencrypt [options]
-			-c, --create                     Create ACME private key
-			-k, --key=FILE                   ACME private key file
-			-e, --email=EMAIL                your contact email
-			-d, --domain=DOMAIN              domain name for certificate
-				--challenge_dir=CDIR         challenge file directory
-				--ssl_dir=SSLDIR             ssl certificate file directory
-				--ssl_key=SSLKEY             ssl private key file
-			-t, --test                       enable test mode
-				--force                      force update even if not expired
-			-l, --logfile=LOGFILE            log to file
-			-h, --hook=HOOK                  script to run on renewal
+    Usage: letsencrypt [options]
+
+    -c, --create                     Create ACME private key
+    -k, --key=FILE                   ACME private key file
+    -e, --email=EMAIL                your contact email
+    -d, --domain=DOMAIN              domain name for certificate
+        --challenge_dir=CDIR         challenge file directory
+        --ssl_dir=SSLDIR             ssl certificate file directory
+        --ssl_key=SSLKEY             ssl private key file
+    -t, --test                       enable test mode
+        --force                      force update even if not expired
+    -l, --logfile=LOGFILE            log to file
+    -h, --hook=HOOK                  script to run on renewal
 
 
 ## conventions used
@@ -60,7 +61,7 @@ gem install blix-letsencrypt
 
 * now create your certificate
 
-      letsencrypt --key=/etc/letsencrypt/account/key.pem -d"example.com www.example.com" --challenge_dir="/srv/certbot/.well-known" --ssl_dir="/etc/letsencrypt/ssl" --logfile=/var/log/letsencrypt.log --create
+      letsencrypt --key=/etc/letsencrypt/account/key.pem -d"example.com www.example.com" --challenge_dir="/srv/certbot/.well-known" --ssl_dir="/etc/letsencrypt/ssl" --create
 
 * hopefully your certificate has be created  so update your webserver to use it...
 
@@ -83,16 +84,19 @@ run a script every day to check if the certificates are due for renewal.
 
  eg:
 
-        cat /etc/cron.daily/renew_ssl
 
-    		!/bin/sh
-    		/opt/ruby-2.6.4/bin/letsencrypt --key=/etc/letsencrypt/account/key.pem \
-            -d"example.com www.example.com" \
-            --challenge_dir="/srv/certbot/.well-known" --ssl_dir="/etc/letsencrypt/ssl" \
-            --logfile=/var/log/letsencrypt.log \
-            --hook=/root/bin/reload_nginx
 
-        cat /root/bin/reload_nginx
+    cat /etc/cron.daily/renew_ssl
+
+    #!/bin/sh
+    /opt/ruby-2.6.4/bin/letsencrypt --key=/etc/letsencrypt/account/key.pem \
+    -d"example.com www.example.com" \
+    --challenge_dir="/srv/certbot/.well-known" --ssl_dir="/etc/letsencrypt/ssl" \
+    --logfile=/var/log/letsencrypt.log \
+    --hook=/root/bin/reload_nginx
+
+
+    cat /root/bin/reload_nginx
 
-    		!/bin/sh
-    		/sbin/nginx -t && /sbin/nginx -sreload
+    #!/bin/sh
+    /sbin/nginx -t && /sbin/nginx -sreload

data/lib/blix/letsencrypt.rb

@@ -229,8 +229,10 @@ fatal_error 'domain name missing'               unless site
 fatal_error 'invalid challenge directory'       unless File.directory?(challenge_dir)
 fatal_error 'invalid ssl certificate directory'       unless File.directory?(ssl_dir)
 fatal_error "ssl private key invalid:#{ssl_key_path}" unless File.file?(ssl_key_path)
+fatal_error "ACME key missing"                        unless options[:key]
 fatal_error "script missing or not executable:#{hook_path}" unless !hook_path || File.executable?(hook_path)
 
+
 certificate_file = File.join(site, SSL_CERT)
 acme_key = File.expand_path(options[:key])
 ssl_key = OpenSSL::PKey::RSA.new(File.read(ssl_key_path))
@@ -299,7 +301,6 @@ order.finalize(:csr => csr)
 timeout_time = Time.now + TIMEOUT
 while order.status == 'processing'
   fatal_error 'certificate timeout' if Time.now > timeout_time
-
   sleep(1)
   order.reload
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blix-letsencrypt
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Clive Andrews
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-04 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acme-client