vpnmaker 1.0.6 → 1.0.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/VERSION +1 -1
- data/bin/vpnmaker +1 -0
- data/lib/server.haml +2 -5
- data/lib/vpnmaker/key_builder.rb +4 -3
- data/vpnmaker.gemspec +1 -1
- metadata +2 -2
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.0.
|
1
|
+
1.0.7
|
data/bin/vpnmaker
CHANGED
data/lib/server.haml
CHANGED
@@ -1,7 +1,6 @@
|
|
1
1
|
\# Auto-generated by vpnmaker on #{gen_host} #{Time.now.to_s}
|
2
2
|
\# See http://github.com/pc/vpnmaker
|
3
3
|
mode server
|
4
|
-
|
5
4
|
dev tun0
|
6
5
|
local #{host}
|
7
6
|
proto udp
|
@@ -9,6 +8,8 @@ port #{port}
|
|
9
8
|
server #{base_ip[:net]} #{base_ip[:mask]}
|
10
9
|
tls-server
|
11
10
|
comp-lzo
|
11
|
+
cipher AES-256-CBC
|
12
|
+
crl-verify #{root}/keys/crl.pem
|
12
13
|
\
|
13
14
|
\# subnets.each do
|
14
15
|
- subnets.each do |net|
|
@@ -42,10 +43,6 @@ group #{group}
|
|
42
43
|
#{key}
|
43
44
|
</key>
|
44
45
|
|
45
|
-
<crl-verify>
|
46
|
-
#{crl}
|
47
|
-
</crl-verify>
|
48
|
-
|
49
46
|
<tls-auth>
|
50
47
|
#{ta}
|
51
48
|
</tls-auth>
|
data/lib/vpnmaker/key_builder.rb
CHANGED
@@ -108,10 +108,11 @@ module VPNMaker
|
|
108
108
|
else
|
109
109
|
pass_spec = '-nodes'
|
110
110
|
end
|
111
|
-
|
112
|
-
`openssl req -batch -days 3650 -new -keyout #{tmppath(user, 'key')} -out #{tmppath(user, 'csr')} -config #{opensslcnf(h)} #{pass_spec}`
|
111
|
+
`openssl req -batch -days 3650 -new -keyout #{tmppath(user, 'key')} -out #{tmppath(user, 'csr')} -config #{opensslcnf(h)} -nodes`
|
113
112
|
`openssl ca -batch -days 3650 -out #{tmppath(user, 'crt')} -in #{tmppath(user, 'csr')} -config #{opensslcnf(h)}`
|
114
|
-
# TODO: this still asks for the export password
|
113
|
+
# TODO: this still asks for the export password and we hack
|
114
|
+
# around it from bin/vpnmaker. This is actually something that
|
115
|
+
# should only be generated dynamically upon user request.
|
115
116
|
`openssl pkcs12 -export -clcerts -in #{tmppath(user, 'crt')} -inkey #{tmppath(user, 'key')} -out #{tmppath(user, 'p12')} #{pass_spec}`
|
116
117
|
@tracker.send(delegate, user, name, email, tmpfile(user, 'key'), tmpfile(user, 'crt'), tmpfile(user, 'p12'), tmpfile('index.txt'), tmpfile('serial'))
|
117
118
|
end
|
data/vpnmaker.gemspec
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: vpnmaker
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.
|
4
|
+
version: 1.0.7
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -503,7 +503,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
503
503
|
version: '0'
|
504
504
|
segments:
|
505
505
|
- 0
|
506
|
-
hash: -
|
506
|
+
hash: -1487208536478993415
|
507
507
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
508
508
|
none: false
|
509
509
|
requirements:
|