construqt 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed2464c5e7f2d3a67a0b14fd55151df6d48cb6f5
-  data.tar.gz: 186694c783b3191b6701b6a56e3fd981ff1a5a6b
+  metadata.gz: 4331146e96ece520a1a1ce639961e821f977fe03
+  data.tar.gz: 278d04395334ee8b7c0ee059d43d0c03123198ca
 SHA512:
-  metadata.gz: 3d8494d2639046c8dba3358f15723f645298cd95f4e4257b621df5ec89cd8d100c00acc6e2e92fa0466b81c9bca05d29fadad3442eb73d8b34ed33156c1f9219
-  data.tar.gz: 6b540e1b967b6b49d0202902247bb321ace97dbb4effaeec4c29304ae6b97f951b81a6ab027c0b12eb3e834a8cfa866f6e1e7890d303698ad6cc8312a621867f
+  metadata.gz: 4547cfc3d2a5a9d98f863dcc4c0d4a73c075e886deb7bed57a97311f5220a37d5a492a771a36c53f61eb2338323e596e1d2b87ec250b754913e86b17da6a359a
+  data.tar.gz: 0a756f1a5ec5e967c88abec431ad6426a86f2bc8b8138c1c55bd6e3bcf557d7ae5109c4e399e53e221caf89adcd87f829b3028dd244c459fc9a74860f96d611b

data/lib/construqt/addresses.rb

@@ -128,7 +128,16 @@ module Construqt
       attr_accessor :routes
       def add_routes(addr_s, via, options = {})
         addrs = addr_s.kind_of?(Array) ? addr_s : [addr_s]
-        addrs.each{|addr| addr.ips.each {|i| add_route(i.to_string, via, options) } }
+        addrs.each do |addr|
+          if addr.respond_to? :ips
+            ips = addr.ips if addr.respond_to? :ips
+          else
+            ips = [addr]
+          end
+          ips.each do |i|
+            add_route(i.to_string, via, options)
+          end
+        end
         self
       end
 

data/lib/construqt/flavour/ubuntu/flavour_ubuntu_ipsec.rb

@@ -10,25 +10,25 @@ module Construqt
         def self.header(host)
           #binding.pry
           addrs = {}
-          host.interfaces.values.each do |iface|
-            iface = iface.delegate
-            next unless iface.cfg
-            next unless iface.cfg.kind_of? Construqt::Ipsec
-            if iface.remote.first_ipv4
-              addrs[iface.remote.first_ipv4.to_s] = "isakmp #{self.remote.first_ipv4.to_s} [500];"
-            end
-            if iface.remote.first_ipv6
-              addrs[iface.remote.first_ipv6.to_s] = "isakmp #{self.remote.first_ipv6.to_s} [500];"
+          host.ipsecs.each do |ipsec|
+            [ipsec.left, ipsec.right].each do |iface|
+              next if iface.host != host
+              if iface.remote.first_ipv4
+                addrs[iface.remote.first_ipv4.to_s] = "isakmp #{iface.remote.first_ipv4.to_s} [500];"
+              end
+              if iface.remote.first_ipv6
+                addrs[iface.remote.first_ipv6.to_s] = "isakmp #{iface.remote.first_ipv6.to_s} [500];"
+              end
             end
           end
           return if addrs.empty?
-          self.host.result.add(self, <<HEADER, Construqt::Resources::Rights::ROOT_0644, "etc", "racoon", "racoon.conf")
-# do not edit generated filed #{path}
+          host.result.add(self, <<HEADER, Construqt::Resources::Rights::ROOT_0644, "etc", "racoon", "racoon.conf")
+# do not edit generated file
 path pre_shared_key "/etc/racoon/psk.txt";
 path certificate "/etc/racoon/certs";
 log info;
 listen {
-#{Util.indent(addrs.keys.sort.map{|k| addrs[k] }.join("\n"), " ")}
+#{Util.indent(addrs.keys.sort.map{|k| addrs[k] }.join("\n"), "  ")}
   strict_address;
 }
 HEADER

data/lib/construqt/util.rb

@@ -157,7 +157,7 @@ module Construqt
     end
 
     def self.indent(body, ident)
-      body.lines.map { |line| ident+line }.join("\n")
+      body.lines.map { |line| ident+line.chomp.strip }.join("\n")
     end
   end
 end

data/lib/construqt/version.rb

@@ -1,3 +1,3 @@
 module Construqt
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: construqt
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Meno Abels
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: construqt-ipaddress