construqt 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ec8fbada65d807c3b03a0659270b3574e274fce
-  data.tar.gz: 021691f9b160814aa6cd08580b0888337f1d8160
+  metadata.gz: ed2464c5e7f2d3a67a0b14fd55151df6d48cb6f5
+  data.tar.gz: 186694c783b3191b6701b6a56e3fd981ff1a5a6b
 SHA512:
-  metadata.gz: cd0256802fca445d8739ba16c613a936664144cb19162ad0c09bc4b91b0e8b27b3522d304647d2b23283812c3b2843db1ee22dd376175c48310bc57eea78c1f2
-  data.tar.gz: e46c4967d8df48ed987ccf52b553ba2ecfb1ba4ff2c988947798f44a8ae2603c747c99bcc764776950dbefaa695034671994dbe0b1c3652b66800664986c77e9
+  metadata.gz: 3d8494d2639046c8dba3358f15723f645298cd95f4e4257b621df5ec89cd8d100c00acc6e2e92fa0466b81c9bca05d29fadad3442eb73d8b34ed33156c1f9219
+  data.tar.gz: 6b540e1b967b6b49d0202902247bb321ace97dbb4effaeec4c29304ae6b97f951b81a6ab027c0b12eb3e834a8cfa866f6e1e7890d303698ad6cc8312a621867f

data/lib/construqt/bgps.rb

@@ -44,16 +44,25 @@ module Construqt
       cfg.left.cfg = cfg
       cfg.right.other = cfg.left
       cfg.right.cfg = cfg
+
+      cfg.right.host.add_bgp(cfg)
+      cfg.left.host.add_bgp(cfg)
       cfg
     end
 
     def self.build_config()
       #binding.pry
       hosts = {}
+      @bgps.values.each do |bgp|
+        hosts[bgp.left.host.object_id] ||= bgp.left.host
+        hosts[bgp.right.host.object_id] ||= bgp.right.host
+      end
+      #binding.pry
+      hosts.values.each do |host|
+        host.flavour.bgp.header(host) if host.flavour.bgp.respond_to?(:header)
+      end
       @bgps.each do |name, bgp|
         bgp.build_config()
-        hosts[bgp.left.host.name] = bgp.left
-        hosts[bgp.right.host.name] = bgp.right
       end
 
       #hosts.values.each do |flavour_bgp|

data/lib/construqt/flavour/delegates.rb

@@ -20,6 +20,14 @@ module Construqt
         @tags = tags
       end
 
+      def vrrp=(a)
+        @vrrp = a
+      end
+
+      def vrrp
+        @vrrp
+      end
+
       def description
         self.delegate.description
       end
@@ -102,15 +110,22 @@ module Construqt
       def _ident
         "Gre_#{self.host.name}_#{self.name}"
       end
+
+      def cfg
+        self.delegate.cfg
+      end
     end
 
     class HostDelegate
       include Delegate
+      attr_reader :users, :bgps, :ipsecs
       def initialize(host)
         #binding.pry
         #Construqt.logger.debug "HostDelegate.new(#{host.name})"
         self.delegate = host
 
+        @ipsecs = []
+        @bgps = []
         @users = host.users || host.region.users
       end
 
@@ -151,8 +166,12 @@ module Construqt
         self.delegate.configip
       end
 
-      def users
-        @users
+      def add_ipsec(ipsec)
+        @ipsecs << ipsec
+      end
+
+      def add_bgp(bgp)
+        @bgps << bgp
       end
 
       def commit

data/lib/construqt/flavour/flavour.rb

@@ -14,6 +14,14 @@ module Construqt
         @flavour.name
       end
 
+      def ipsec
+        @flavour.ipsec
+      end
+
+      def bgp
+        @flavour.bgp
+      end
+
       def clazzes
         ret = {
           "opvn" => OpvnDelegate,

data/lib/construqt/flavour/mikrotik/flavour_mikrotik.rb

@@ -230,7 +230,7 @@ TESTNAME
           host.result.add("add", nil, "tool", "graphing", "interface")
 
           host.result.add("set [ find name!=ssh && name!=www-ssl ] disabled=yes", nil, "ip", "service")
-          host.result.add("set [ find ] address=#{host.id.first_ipv6.first_ipv6}", nil, "ip", "service")
+          host.result.add("set [ find ] address=0::/0", nil, "ip", "service")
           host.result.add("set [ find name!=admin ] comment=REMOVE", nil, "user")
 
           host.result.render_mikrotik({
@@ -367,6 +367,14 @@ OUT
         end.compact.join(":").sub(/:+$/, '::')
       end
 
+      def self.ipsec
+        Ipsec
+      end
+
+      def self.bgp
+        Bgp
+      end
+
       def self.clazzes
         {
           "opvn" => Ovpn,
@@ -377,10 +385,10 @@ OUT
           "bridge" => Bridge,
           "bond" => Bond,
           "vlan" => Vlan,
-          "result" => Result,
+          #"result" => Result,
           "template" => Template,
-          "bgp" => Ipsec,
-          "ipsec" => Bgp
+          #"bgp" => Ipsec,
+          #"ipsec" => Bgp
         }
       end
       def self.clazz(name)

data/lib/construqt/flavour/mikrotik/flavour_mikrotik_interface.rb

@@ -44,11 +44,11 @@ module Construqt
 
           cfg['distance'] = rt.metric if rt.metric
           default = {
-            "dst-address" => Schema.network.required,
+            "dst-address" => Schema.network.required.key(0),
             "gateway" => Schema.address,
             "type" => Schema.identifier,
             "distance" => Schema.int,
-            "comment" => Schema.string.required.key
+            "comment" => Schema.string.required.key(1)
           }
           cfg['comment'] = "#{cfg['dst-address']} via #{cfg['gateway']} CONSTRUQT"
           if rt.dst.ipv6?

data/lib/construqt/flavour/mikrotik/flavour_mikrotik_result.rb

@@ -44,7 +44,8 @@ module Construqt
           end
 
           OpenStruct.new(
-            :key => keys.map{|k,v| "#{k}=#{default[k].serialize(v)}"}.sort.join(" && "),
+            :key => keys.keys.sort{|a,b| default[a].key_order <=> default[b].key_order }
+                        .map{|k| v=keys[k]; "#{k}=#{default[k].serialize(v)}"}.join(" && "),
             :result => result,
             :add_line => result.select{ |k,v|
               if default[k].kind_of?(Schema) && default[k].noset?

data/lib/construqt/flavour/mikrotik/flavour_mikrotik_schema.rb

@@ -189,11 +189,16 @@ module Construqt
           @required
         end
 
-        def key
+        def key(order = 0)
           @key = true
+          @key_order = order
           self
         end
 
+        def key_order
+          @key_order || 0
+        end
+
         def key?
           @key
         end

data/lib/construqt/flavour/plantuml/plantuml.rb

@@ -111,11 +111,11 @@ UML
       end
 
       def self.render_object_address(iface)
+        tags = []
         out = []
         out << "name = \"#{iface.name}\""
         out << "desc = \"#{iface.description}\"" if iface.description
         if iface.address
-          tags = []
           [iface.address.v4s, iface.address.v6s].each do |ips|
             next unless ips.first
             prefix = ips.first.ipv4? ? "ipv4" : "ipv6"
@@ -125,17 +125,27 @@ UML
             end
           end
 
-          iface.address.routes.each_with_index do |route, idx|
-            out << "route(#{idx}) = \"#{route.dst.to_string} via #{route.via.to_s}\""
+          if iface.address.dhcpv4?
+            out << "dhcpv4 = client"
           end
-          iface.delegate.firewalls && iface.delegate.firewalls.each_with_index do |fw, idx|
-            out << "fw(#{idx}) = \"#{fw.name}\""
+
+          if iface.address.dhcpv6?
+            out << "dhcpv6 = client"
           end
-          (iface.tags+tags).sort.uniq.each_with_index do |tag, idx|
-            out << "tag(#{idx}) = \"#{tag}\""
+
+          iface.address.routes.each_with_index do |route, idx|
+            out << "route(#{idx}) = \"#{route.dst.to_string} via #{route.via.to_s}\""
           end
         end
 
+        iface.delegate.firewalls && iface.delegate.firewalls.each_with_index do |fw, idx|
+          out << "fw(#{idx}) = \"#{fw.name}\""
+        end
+
+        (iface.tags+tags).sort.uniq.each_with_index do |tag, idx|
+          out << "tag(#{idx}) = \"#{tag}\""
+        end
+
         out.join("\n")
       end
 
@@ -440,13 +450,15 @@ UML
             elsif File.exists?("/usr/bin/dot")
               dot = "/usr/bin/dot"
             else
-              dot = "$HOME/macosx/bin/dot"
+              dot = "$(which dot)"
             end
+
             if  File.exists?("#{ENV['HOMEPATH']}/Downloads/plantuml.jar")
               plantuml_jar = "#{ENV['HOMEPATH']}/Downloads/plantuml.jar"
             else
-               plantuml_jar = "~/Downloads/plantuml.jar"
+              plantuml_jar = "$HOME/Downloads/plantuml.jar"
             end
+
             system("java -jar \"#{plantuml_jar}\" -Djava.awt.headless=true -graphvizdot \"#{dot}\" -tsvg cfgs/world.puml")
           end
 

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

@@ -333,6 +333,13 @@ PAM
         end
       end
 
+      def self.ipsec
+        Ipsec
+      end
+      def self.bgp
+        Bgp
+      end
+
       def self.clazzes
         {
           "opvn" => Opvn,
@@ -343,9 +350,9 @@ PAM
           "bridge" => Bridge,
           "bond" => Bond,
           "vlan" => Vlan,
-          "result" => Result,
-          "ipsec" => Ipsec,
-          "bgp" => Bgp,
+          #"result" => Result,
+          #"ipsec" => Ipsec,
+          #"bgp" => Bgp,
           "template" => Template
         }
       end

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

@@ -8,14 +8,8 @@ module Construqt
         end
 
         def self.header(host)
-          addrs = {}
-          host.interfaces.values.each do |iface|
-            iface = iface.delegate
-            next unless iface.cfg
-            next unless iface.cfg.kind_of? Construqt::Bgp
-            addrs[iface.name] = iface
-          end
-          return if addrs.empty?
+          return if host.bgps.empty?
+          # binding.pry
           bird_v4 = self.header_bird(host, OpenStruct.new(:net_clazz => IPAddress::IPv4, :filter => lambda {|ip| ip.ipv4? }))
           host.result.add(self, bird_v4, Construqt::Resources::Rights::ROOT_0644, "etc", "bird", "bird.conf")
           bird_v6 = self.header_bird(host, OpenStruct.new(:net_clazz => IPAddress::IPv6, :filter => lambda {|ip| ip.ipv6? }))
@@ -23,7 +17,7 @@ module Construqt
         end
 
         def self.header_bird(host, mode)
-          #      binding.pry
+          #binding.pry
           ret = <<BGP
 log syslog { debug, trace, info, remote, warning, error, auth, fatal, bug };
 router id #{host.id.first_ipv4.first_ipv4.to_s};
@@ -108,6 +102,7 @@ BGP
         end
 
         def build_config(unused, unused1)
+          # binding.pry
           build_bird_conf
           build_bird6_conf
         end

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

@@ -8,6 +8,7 @@ module Construqt
         end
 
         def self.header(host)
+          #binding.pry
           addrs = {}
           host.interfaces.values.each do |iface|
             iface = iface.delegate
@@ -117,22 +118,25 @@ RACOON
           end
         end
 
+        def psk(ip, cfg)
+          [
+            "# #{cfg.name}",
+            "#{ip} #{Util.password(cfg.password)}"
+          ].join("\n")
+        end
+
         def build_config(unused, unused2)
           #      build_gre_config()
           #binding.pry
           if self.other.remote.first_ipv6
             build_racoon_config(self.other.remote.first_ipv6.to_s)
-            host.result.add(self, <<IPV6, Construqt::Resources::Rights::ROOT_0600, "etc", "racoon", "psk.txt")
-# #{self.cfg.name}
-            #{self.other.remote.first_ipv6.to_s} #{Util.password(self.cfg.password)}
-IPV6
+            host.result.add(self, psk(self.other.remote.first_ipv6.to_s, cfg),
+                            Construqt::Resources::Rights::ROOT_0600, "etc", "racoon", "psk.txt")
             build_policy(self.remote.first_ipv6.to_s, self.other.remote.first_ipv6.to_s, self.my, self.other.my)
           elsif self.other.remote.first_ipv4
             build_racoon_config(self.other.remote.first_ipv4.to_s)
-            host.result.add(self, <<IPV4, Construqt::Resources::Rights::ROOT_0600, "etc", "racoon", "psk.txt")
-# #{self.cfg.name}
-            #{self.other.remote.first_ipv4.to_s} #{Util.password(self.cfg.password)}
-IPV4
+            host.result.add(self, psk(self.other.remote.first_ipv4.to_s, cfg),
+                            Construqt::Resources::Rights::ROOT_0600, "etc", "racoon", "psk.txt")
             build_policy(self.remote.first_ipv4.to_s, self.other.remote.first_ipv4.to_s, self.my, self.other.my)
           else
             throw "ipsec need a remote address"

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

@@ -3,6 +3,72 @@ module Construqt
   module Flavour
     module Ubuntu
 
+      class EtcConntrackdConntrackd
+        def initialize(result)
+          @result = result
+          @others = []
+        end
+
+        class Other
+          attr_accessor :ifname, :my_ip, :other_ip
+        end
+
+        def add(ifname, my_ip, other_ip)
+          other = Other.new
+          other.ifname = ifname
+          other.my_ip = my_ip
+          other.other_ip = other_ip
+          @others << other
+        end
+
+        def commit
+          return '' if @others.empty?
+          out = [<<CONNTRACKD]
+General {
+	HashSize 32768
+	HashLimit 524288
+	Syslog on
+	LockFile /var/lock/conntrackd.lock
+	UNIX {
+		Path /var/run/conntrackd.sock
+		Backlog 20
+	}
+	SocketBufferSize 262142
+	SocketBufferSizeMaxGrown 655355
+	Filter {
+		Protocol Accept {
+			TCP
+		}
+		Address Ignore {
+			IPv4_address 127.0.0.1 # loopback
+		}
+	}
+}
+Sync {
+	Mode FTFW {
+   	DisableExternalCache Off
+		CommitTimeout 1800
+		PurgeTimeout 5
+	}
+CONNTRACKD
+          @others.each do |other|
+            out.push(<<OTHER)
+  UDP Default {
+          IPv4_address #{other.my_ip}
+          IPv4_Destination_Address #{other.other_ip}
+          Port 3780
+          Interface #{other.ifname}
+          SndSocketBuffer 24985600
+          RcvSocketBuffer 24985600
+          Checksum on
+  }
+OTHER
+          end
+          out.push("}")
+          out.join("\n")
+        end
+      end
+
       class EtcNetworkIptables
         def initialize
           @mangle = Section.new('mangle')
@@ -389,22 +455,16 @@ VRRP
       end
 
       class Result
+        attr_reader :etc_network_interfaces, :etc_network_iptables, :etc_conntrackd_conntrackd
         def initialize(host)
           @host = host
           @etc_network_interfaces = EtcNetworkInterfaces.new(self)
           @etc_network_iptables = EtcNetworkIptables.new
+          @etc_conntrackd_conntrackd = EtcConntrackdConntrackd.new(self)
           @etc_network_vrrp = EtcNetworkVrrp.new
           @result = {}
         end
 
-        def etc_network_interfaces
-          @etc_network_interfaces
-        end
-
-        def etc_network_iptables
-          @etc_network_iptables
-        end
-
         def etc_network_vrrp(ifname)
           @etc_network_vrrp.get(ifname)
         end
@@ -432,7 +492,6 @@ VRRP
             #binding.pry
             #@result[path] << [clazz.xprefix(@host)].compact
           end
-
           @result[path] << block+"\n"
         end
 
@@ -460,6 +519,7 @@ VRRP
           add(EtcNetworkIptables, etc_network_iptables.commitv4, Construqt::Resources::Rights::ROOT_0644, "etc", "network", "iptables.cfg")
           add(EtcNetworkIptables, etc_network_iptables.commitv6, Construqt::Resources::Rights::ROOT_0644, "etc", "network", "ip6tables.cfg")
           add(EtcNetworkInterfaces, etc_network_interfaces.commit, Construqt::Resources::Rights::ROOT_0644, "etc", "network", "interfaces")
+          add(EtcConntrackdConntrackd, etc_conntrackd_conntrackd.commit, Construqt::Resources::Rights::ROOT_0644, "etc", "conntrack", "conntrackd.conf")
           @etc_network_vrrp.commit(self)
           out = [<<BASH]
 #!/bin/bash
@@ -471,12 +531,13 @@ fi
 if [ $hostname != #{@host.name} ]
 then
  echo 'You try to run a deploy script on a host which has not the right name $hostname != #{@host.name}'
+ exit 47
 else
  echo Configure Host #{@host.name}
 fi
 updates=''
 for i in language-pack-en language-pack-de git aptitude traceroute vlan bridge-utils tcpdump mtr-tiny \\
-bird keepalived strace iptables conntrack openssl racoon ulogd2 ifenslave
+bird keepalived strace iptables conntrack openssl racoon ulogd2 ifenslave conntrackd conntrack bind9
 do
  dpkg -l $i > /dev/null 2> /dev/null
  if [ $? != 0 ]

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

@@ -9,11 +9,11 @@ module Construqt
           end
 
           def up(ifname)
-            "/usr/sbin/dhcrelay -pf /run/dhcrelay-v4.#{ifname}.pid -d -q -4 -i #{ifname} #{@service.servers.map{|i| i.to_s}.join(' ')}"
+            "/usr/sbin/dhcrelay -pf /run/dhcrelay-v4.#{ifname}.pid -q -4 -i #{ifname} #{@service.servers.map{|i| i.to_s}.join(' ')}"
           end
 
           def down(ifname)
-            "kill `/run/dhcrelay-v4.#{ifname}.pid`"
+            "kill `cat /run/dhcrelay-v4.#{ifname}.pid`"
           end
 
           def vrrp(host, ifname, iface)
@@ -34,23 +34,28 @@ module Construqt
             @service = service
           end
 
-          def up(ifname)
-            "/usr/sbin/dhcrelay -pf /run/dhcrelay-v6.#{ifname}.pid -d -q -6 -i #{ifname} #{@service.servers.map{|i| i.to_s}.join(' ')}"
+          def up(iface, ifname)
+            "/usr/sbin/dhcrelay -pf /run/dhcrelay-v6.#{ifname}.pid -q -6 -l #{iface.address.first_ipv6.to_s}%#{ifname} #{@service.servers.map{|i| "-u #{i.ip}%#{i.iface}" }.join(' ')}"
           end
 
-          def down(ifname)
-            "kill `/run/dhcrelay-v6.#{ifname}.pid`"
+          def down(iface, ifname)
+            "kill `cat /run/dhcrelay-v6.#{ifname}.pid`"
           end
 
           def vrrp(host, ifname, iface)
-            host.result.etc_network_vrrp(iface.name).add_master(up(ifname)).add_backup(down(ifname))
+            host.result.etc_network_vrrp(iface.name).add_master(up(iface, ifname)).add_backup(down(iface, ifname))
           end
 
           def interfaces(host, ifname, iface, writer)
             return unless iface.address && iface.address.first_ipv6
             return if @service.servers.empty?
-            writer.lines.up(up(ifname))
-            writer.lines.down(down(ifname))
+            @service.servers.each do |server|
+              unless @service.services.region.interfaces.find(host, server.iface)
+                throw "DhcpV6Relay interface with name #{service.iface} not found on #{host.name}"
+              end
+            end
+            writer.lines.up(up(iface, ifname))
+            writer.lines.down(down(iface, ifname))
           end
         end
 
@@ -99,11 +104,41 @@ RADV
           end
         end
 
+        class ConntrackD
+          def initialize(service)
+            @service = service
+          end
+
+          def up(ifname)
+            "/usr/share/doc/conntrackd/examples/sync/primary-backup.sh primary"
+          end
+
+          def down(ifname)
+            "/usr/share/doc/conntrackd/examples/sync/primary-backup.sh backup"
+          end
+
+          def vrrp(host, ifname, iface)
+            #binding.pry
+            host.result.etc_network_vrrp(iface.name).add_master(up(ifname)).add_backup(down(ifname))
+          end
+
+          def interfaces(host, ifname, iface, writer)
+            throw "only vrrp ifaces could be used to conntrack: #{ifname}:#{iface.name}" unless iface.vrrp
+            throw "conntrack needs a ipv4 address #{ifname}:#{iface.name}" unless iface.address.first_ipv4
+            throw "conntrack currently a ipv4 address #{iface.host.name}:#{ifname}:#{iface.name}" unless iface.address.first_ipv4
+            other_if = iface.vrrp.delegate.interfaces.find{|i| i.host != host }
+            throw "conntrack currently a ipv4 address #{other_if.host.name}:#{other_if.name}" unless other_if.address.first_ipv4
+            #binding.pry
+            host.result.etc_conntrackd_conntrackd.add(ifname, iface.address.first_ipv4, other_if.address.first_ipv4)
+          end
+        end
+
         def self.get_renderer(service)
           factory = {
             Construqt::Services::DhcpV4Relay => DhcpV4Relay,
             Construqt::Services::DhcpV6Relay => DhcpV6Relay,
-            Construqt::Services::Radvd => Radvd
+            Construqt::Services::Radvd => Radvd,
+            Construqt::Services::ConntrackD => ConntrackD
           }
           found = factory.keys.find{ |i| service.kind_of?(i) }
           throw "service type unknown #{service.name} #{service.class.name}" unless found

data/lib/construqt/flavour/unknown/unknown.rb

@@ -111,6 +111,13 @@ module Construqt
 
       #	end
       #
+      #
+      def self.ipsec
+        Ipsec
+      end
+      def self.bgp
+        Bgp
+      end
       def self.clazzes
         {
           "opvn" => Opvn,
@@ -122,7 +129,6 @@ module Construqt
           "template" => Template,
           "bond" => Bond,
           "vlan" => Vlan,
-          "result" => Result
         }
       end
 

data/lib/construqt/interfaces.rb

@@ -109,6 +109,7 @@ module Construqt
         cfg['interface'] = interface
         throw "vrrp interface does not have within the same network" if nets.length == interface.address.ips.select { |adr| nets[adr.network.to_s] }.length
         dev = add_device(interface.host, name, cfg)
+        interface.vrrp = dev
         dev.address.interface = nil
         dev.address.host = nil
         dev.address.name = name

data/lib/construqt/ipsecs.rb

@@ -40,6 +40,9 @@ module Construqt
       cfg.right.other = cfg.left
       cfg.right.cfg = cfg
 
+      cfg.left.host.add_ipsec(cfg)
+      cfg.right.host.add_ipsec(cfg)
+
       #puts "-------- #{cfg.left.my.host.name} - #{cfg.right.my.host.name}"
       cfg.left.interface = cfg.left.my.host.region.interfaces.add_gre(cfg.left.my.host, cfg.left.other.host.name,
                                                                       "address" => cfg.left.my,
@@ -56,6 +59,15 @@ module Construqt
     end
 
     def self.build_config()
+      hosts = {}
+      @ipsecs.values.each do |ipsec|
+        hosts[ipsec.left.host.object_id] ||= ipsec.left.host
+        hosts[ipsec.right.host.object_id] ||= ipsec.right.host
+      end
+      #binding.pry
+      hosts.values.each do |host|
+        host.flavour.ipsec.header(host) if host.flavour.ipsec.respond_to?(:header)
+      end
       @ipsecs.each do |name, ipsec|
         ipsec.build_config()
       end

data/lib/construqt/networks.rb

@@ -8,14 +8,9 @@ module Construqt
         @domain = "construqt.org"
         @contact = "soa@construqt.org"
         @addresses = Construqt::Addresses.new(self)
-        @services = Construqt::Services.new
         @dns_resolver = nil
       end
 
-      def services
-        @services
-      end
-
       def addresses
         @addresses
       end

data/lib/construqt/regions.rb

@@ -3,7 +3,7 @@ module Construqt
   module Regions
     @regions = {}
     class Region
-      attr_reader :name, :cables, :hosts, :interfaces, :users, :vlans, :network, :templates, :resources
+      attr_reader :name, :cables, :hosts, :interfaces, :users, :vlans, :network, :templates, :resources, :services
       def initialize(name, network)
         @name = name
         @network = network
@@ -13,6 +13,7 @@ module Construqt
         @templates = Construqt::Templates.new(self)
         @users = Construqt::Users.new(self)
         @cables = Construqt::Cables.new(self)
+        @services = Construqt::Services.new(self)
         @resources = Construqt::Resources.new(self)
       end
     end

data/lib/construqt/services.rb

@@ -1,8 +1,14 @@
 module Construqt
   class Services
+    class ConntrackD
+      attr_accessor :name, :services
+      def initialize(name)
+        self.name = name
+      end
+    end
 
     class DhcpV4Relay
-      attr_accessor :servers, :name
+      attr_accessor :servers, :name, :services
       def initialize(name)
         self.name = name
         self.servers = []
@@ -15,26 +21,38 @@ module Construqt
       end
     end
     class DhcpV6Relay
-      attr_accessor :servers, :name
+      attr_accessor :servers, :name, :services
       def initialize(name)
         self.name = name
         self.servers = []
       end
-      def add_server(ip)
+      class Server
+        attr_accessor :ip, :iface
+      end
+      def add_server(name)
+        (ip, iface) = name.split("%")
+        throw "ip not set #{name}" unless ip
         ip = IPAddress.parse(ip)
         throw "ip must be a v6 address" unless ip.ipv6?
-        self.servers << ip
+        throw "iface not set #{name}" if iface.nil? || iface.empty?
+        server = Server.new
+        server.ip = ip
+        server.iface = iface
+        self.servers << server
         self
       end
     end
     class Radvd
-      attr_accessor :servers, :name
+      attr_accessor :servers, :name, :services
       def initialize(name)
         self.name = name
       end
     end
 
-    def initialize
+
+    attr_reader :region
+    def initialize(region)
+      @region = region
       @services = {}
     end
 
@@ -46,6 +64,7 @@ module Construqt
 
     def add(service)
       @services[service.name] = service
+      service.services = self
       self
     end
 

data/lib/construqt/version.rb

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

data/lib/construqt.rb

@@ -3,7 +3,7 @@ require 'logger'
 require 'fileutils'
 require 'ostruct'
 
-require 'ipaddress'
+require 'construqt/ipaddress'
 require 'digest/sha1'
 require 'digest/md5'
 require "base64"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: construqt
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Meno Abels
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-29 00:00:00.000000000 Z
+date: 2014-12-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: construqt-ipaddress
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement