vpnmaker 1.0.7 → 1.0.8

data/VERSION

@@ -1 +1 @@
-1.0.7
+1.0.8

data/lib/client.haml

@@ -51,4 +51,5 @@ ping 30
   nobind
   key #{user}-#{(revoked.max || - 1) + 1}.key
   remote-cert-tls server
+
 :plain

data/lib/example_vpnmaker_site.config.yaml

@@ -17,7 +17,7 @@
   :group: nogroup
   :root: /etc/openvpn
   :log: /var/log/openvpn.log
-  :host: staging.pvstream.in
+  :host: MY_HOST_FQDN
   :port: 1194
 
 :client:

data/lib/server.haml

@@ -9,20 +9,22 @@ server #{base_ip[:net]} #{base_ip[:mask]}
 tls-server
 comp-lzo
 cipher AES-256-CBC
-  crl-verify #{root}/keys/crl.pem
-\
-\# subnets.each do
-- subnets.each do |net|
-  route #{net[:net]} #{net[:mask]}
-  push route #{net[:net]} #{net[:mask]}
-\
-\# bridgednets.each do
-- bridgednets.each do |net|
-  push route #{net[:net]} #{net[:mask]}
+crl-verify #{crl_path}/crl.pem
+
+- unless subnets.empty?
+  \# subnets.each do
+  - subnets.each do |net|
+    route #{net[:net]} #{net[:mask]}
+    push route #{net[:net]} #{net[:mask]}
+
+- unless bridgednets.empty?
+  \# bridgednets.each do
+  - bridgednets.each do |net|
+    push route #{net[:net]} #{net[:mask]}
 \
 push "redirect-gateway"
 client-to-client
-\
+
 user #{user}
 group #{group}
 - if type == :default
@@ -55,7 +57,8 @@ group #{group}
   crl-verify #{root}/keys/crl.pem
   
 keepalive 10 120
-log #{log}
+\#log #{log}
 persist-tun
 persist-key
+
 :plain

data/lib/vpnmaker/config_generator.rb

@@ -32,7 +32,8 @@ module VPNMaker
       separator = '-----BEGIN CERTIFICATE-----'
       cert = File.read(@dirname + "/server.crt").split(separator).last.insert(0, separator)
       {
-        :gen_host => Socket.gethostname
+        :gen_host => Socket.gethostname,
+        :crl_path => @mgr.tracker.path
       }.merge(@mgr.config[:server]).merge(@runtime_cfg).merge(:key => File.read(@dirname + "/server.key"),
                                                               :cert => cert,
                                                               :crl => File.read(@dirname + "/crl.pem"))
@@ -41,8 +42,8 @@ module VPNMaker
     def server
       haml_vars = server_conf.dup
       haml_vars[:base_ip] = ((a = IPAddr.new haml_vars[:base_ip]); {:net => a.to_s, :mask => a.subnet_mask.to_s})
-      haml_vars[:bridgednets] = haml_vars[:bridgednets].map {|net| a = (IPAddr.new net); {:net => a.to_s, :mask => a.subnet_mask.to_s}}
-      haml_vars[:subnets] = haml_vars[:subnets].map {|net| a = (IPAddr.new net); {:net => a.to_s, :mask => a.subnet_mask.to_s}}
+      haml_vars[:bridgednets] ? (haml_vars[:bridgednets] = haml_vars[:bridgednets].map {|net| a = (IPAddr.new net); {:net => a.to_s, :mask => a.subnet_mask.to_s}}) : (haml_vars[:bridgednets] = Hash.new)
+      haml_vars[:subnets] ? (haml_vars[:subnets] = haml_vars[:subnets].map {|net| a = (IPAddr.new net); {:net => a.to_s, :mask => a.subnet_mask.to_s}}) : (haml_vars[:subnets] = Hash.new)
       template = File.read(@mgr.tracker.path + \
                            "/" + @mgr.config[:site][:template_dir] + \
                            "/" + 'server.haml')

data/vpnmaker.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "vpnmaker"
-  s.version = "1.0.7"
+  s.version = "1.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Voip Scout"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vpnmaker
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -503,7 +503,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1487208536478993415
+      hash: 795314368865926665
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: