daddy 0.5.22 → 0.5.23

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: db9d28b809805c80d7ad71a4fe5006ebbbddacdf
4
- data.tar.gz: 9b8c6041c04d4266f0c37cba3837ce536a6cd389
3
+ metadata.gz: 3588879fe8162f7258cfd2dcd41fb2b4a17cfe9e
4
+ data.tar.gz: fcade72e497332b8a7ec62968a237dba51cbaf44
5
5
  SHA512:
6
- metadata.gz: 7e3015ff260aa57d0b3dd6cf7d3d10bdd0665765f1c8a43667e4f23867991fa8dd228877aa3aab84ea46fc312c3a7da31873f98f17f8045c50049a8c3ece0e47
7
- data.tar.gz: 8dc3e90e63670909cb33f87632847f5c374fa01499b35ced8af0a4dd897a2d25f38e68ea5ba37668a8459bf262e2a0163e1613c752ec28e87647f5d26f1f21bf
6
+ metadata.gz: 580a893493c5dca02ed6ff37af25104970d805093f5bbf631a26da44bdc390f206ba59249d688455ea62aaadd85d46c33e2fed7ec8003539249bf072371ea0a0
7
+ data.tar.gz: 5f2e0cfdc816d9d2886e793b024f45824c3ba7b2387b580ec20f409a4ca775b5b33467ce964dba6b84bae009fdf2f2253bacc9bd14c91826275f2cf34609e2be
@@ -1,6 +1,7 @@
1
1
  <%-
2
- @ssl = system("sudo test -e /etc/letsencrypt/live/#{@server_name}/fullchain.pem") &&
3
- system("sudo test -e /etc/letsencrypt/live/#{@server_name}/privkey.pem")
2
+ @letsencrypt = system("sudo test -e /etc/letsencrypt/live/#{@server_name}/fullchain.pem")
3
+ @selfsigned = system('sudo test -e /etc/pki/tls/certs/localhost.crt')
4
+ @ssl = @letsencrypt || @selfsigned
4
5
  -%>
5
6
  server {
6
7
  listen 80;
@@ -10,9 +11,12 @@ server {
10
11
  server_name <%= @server_name %>;
11
12
  access_log /opt/nginx/logs/<%= @server_name %>_access.log ltsv;
12
13
 
13
- <%- if @ssl -%>
14
+ <%- if @letsencrypt -%>
14
15
  ssl_certificate /etc/letsencrypt/live/<%= @server_name %>/fullchain.pem;
15
16
  ssl_certificate_key /etc/letsencrypt/live/<%= @server_name %>/privkey.pem;
17
+ <%- elsif @selfsigned -%>
18
+ ssl_certificate /etc/pki/tls/certs/localhost.crt;
19
+ ssl_certificate_key /etc/pki/tls/private/localhost.key;
16
20
  <%- end -%>
17
21
 
18
22
  root <%= ::File.join(@rails_root, 'public') %>;
@@ -1,3 +1,3 @@
1
1
  module Daddy
2
- VERSION = '0.5.22'
2
+ VERSION = '0.5.23'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: daddy
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.22
4
+ version: 0.5.23
5
5
  platform: ruby
6
6
  authors:
7
7
  - ichy
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-05-13 00:00:00.000000000 Z
11
+ date: 2017-05-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: capybara