make it possible to pass a hash of options for further configuration

manifests/connect_to.pp

@@ -5,7 +5,7 @@ define tinc::connect_to(
   $to,
   $to_fqdn,
   $target,
-  ){
+){
   if $::fqdn != $to_fqdn {
     concat::fragment{
       $name:

manifests/hostfile.pp

@@ -1,31 +0,0 @@
-# a hostfile for a certain network
-# title must be:
-#    hostname@network
-#
-define tinc::hostfile(
-  $source_dir = undef,
-  $net        = undef, 
-  $ensure     = present,
-) {
-  # if absent the net should
-  # clean it up by itself
-  if $ensure == 'present' {
-    include tinc
-    if $tinc::uses_systemd {
-      $service_name = "tincd@${net}"
-    } else {
-      $service_name = 'tinc'
-    }
-    if $net and $source_dir {
-      file{"/etc/tinc/${net}/hosts/${name}":
-        source  => "${source_dir}/${name}",
-        # to be sure that we manage that net
-        require => File["/etc/tinc/${net}/hosts"],
-        notify  => Service[$service_name],
-        owner   => root,
-        group   => 0,
-        mode    => '0600';
-      }
-    }
-  }
-}

manifests/instance.pp

@@ -4,12 +4,12 @@ define tinc::instance(
   $connect_on_boot          = true,
   $tinc_interface           = 'eth0',
   $tinc_address             = undef,
+  $tinc_address_to_export   = undef,
   $port                     = '655',
+  $port_to_export           = '655',
   $compression              = '10',
   $mode                     = 'switch',
-  $tinc_connect_to          = undef,
+  $options                  = {},
-  $tinc_accept_from         = undef,
-  $tinc_hostfiles_dir       = 'absent',
   $tinc_up_content          = undef,
   $tinc_down_content        = undef,
 ){
@@ -97,6 +97,11 @@ define tinc::instance(
       $int_name_escaped = regsubst($tinc_interface,'\.','_','G')
       $host_address = getvar("::ipaddress_${int_name_escaped}")
     }
+    if $tinc_address_to_export {
+      $export_addr = $tinc_address_to_export
+    } else {
+      $export_addr = $host_address
+    }
 
     # get the keys
     # [ priv, pub ]
@@ -115,54 +120,30 @@ define tinc::instance(
         group   => 0,
         mode    => '0600';
     }
-
+    # export this host and collect all the other hosts
-    # if (! $tinc_connect_to) and (!$tinc_accept_from) {
+    @@tinc::host{"${fqdn_tinc}@${name}":
-    if $::settings::storeconfigs {
+      port        => $port_to_export,
-      notify {"debug_storeconfigs": message => "If storeconfigs is true, then I should change something"}
+      compression => $compression,
-      # export this host and collect all the other hosts
+      address     => $export_addr,
-      # @@tinc::host{"${fqdn_tinc}@${name}":
+      public_key  => $tinc_keys[1],
-      #   port        => $port,
+      tag         => "tinc::host_for_${name}",
-      #   compression => $compression,
-      #   address     => $host_address,
-      #   public_key  => $tinc_keys[1],
-      #   tag         => "tinc::host_for_${name}",
-      # }
-      # Tinc::Host<<| tag == "tinc::host_for_${name}" |>>
-
-      # @@tinc::connect_to{"${name}_connect_to_${fqdn_tinc}":
-      #   to      => $fqdn_tinc,
-      #   to_fqdn => $::fqdn,
-      #   target  => $tinc_config,
-      #   tag     => "tinc_${name}_auto",
-      # Tinc::Connect_to<<| tag == "tinc_${name}_auto" |>>
-
-    }
-    else {
-      tinc::host{"${fqdn_tinc}@${name}":
-        port        => $port,
-        compression => $compression,
-        address     => $host_address,
-        public_key  => $tinc_keys[1],
-      }
-
-      $tinc_hosts = union($tinc_accept_from, $tinc_connect_to)
-      tinc::hostfile {$tinc_hosts:
-        source_dir => $tinc_hostfiles_dir,
-        net => $name
-      }
-      
-      $connect_params = $tinc_connect_to.reduce({}) |$memo, $entry|
-      {merge($memo, {"${fqdn_tinc}_connect_to_${entry}" => {to => $entry, to_fqdn => "", target => $tinc_config}})}
-
-      create_resources(tinc::connect_to, $connect_params)
     }
+    Tinc::Host<<| tag == "tinc::host_for_${name}" |>>
 
     concat::fragment{"tinc_conf_header_${name}":
       target  => $tinc_config,
       content => template('tinc/tinc.conf-header.erb'),
       order   => '100',
     }
-    
+
+    @@tinc::connect_to{"${name}_connect_to_${fqdn_tinc}":
+      to      => $fqdn_tinc,
+      to_fqdn => $::fqdn,
+      target  => $tinc_config,
+      tag     => "tinc_${name}_auto",
+    }
+    Tinc::Connect_to<<| tag == "tinc_${name}_auto" |>>
+
     file { "/etc/tinc/${name}/tinc-up":
       content => $tinc_up_content,
       notify  => Service[$service_name],

manifests/switch.pp

@@ -5,33 +5,33 @@ define tinc::switch(
   $tinc_interface           = 'eth0',
   $tinc_address             = undef,
   $port                     = '655',
+  $tinc_address_to_export   = undef,
+  $port_to_export           = '655',
   $tinc_internal_interface  = 'eth1',
   $tinc_internal_ip         = 'absent',
   $tinc_internal_netmask    = 'absent',
   $tinc_bridge_interface    = 'absent',
-  $tinc_connect_to          = undef,
-  $tinc_accept_from         = undef,
-  $tinc_hostfiles_dir       = 'absent',
   $compression              = '10',
+  $options                  = {},
   $shorewall_zone           = 'absent'
 ){
 
   tinc::instance{$name:
-    ensure          => $ensure,
+    ensure                 => $ensure,
-    connect_on_boot => $connect_on_boot,
+    connect_on_boot        => $connect_on_boot,
-    tinc_interface  => $tinc_interface,
+    tinc_interface         => $tinc_interface,
-    tinc_address    => $tinc_address,
+    tinc_address           => $tinc_address,
-    port            => $port,
+    tinc_address_to_export => $tinc_address_to_export,
-    compression     => $compression,
+    port                   => $port,
-    mode            => 'switch',
+    port_to_export         => $port_to_export,
-    tinc_connect_to      => $tinc_connect_to,
+    compression            => $compression,
-    tinc_accept_from     => $tinc_accept_from,
+    mode                   => 'switch',
-    tinc_hostfiles_dir   => $tinc_hostfiles_dir,
+    options                => $options,
   }
 
   if $ensure == 'present' {
     include ::tinc
-    # require bridge_utils
+    require bridge_utils
     $real_tinc_bridge_interface = $tinc_bridge_interface ? {
       'absent'  => "br${name}",
       default   => $tinc_bridge_interface

templates/tinc.conf-header.erb

@@ -1,9 +1,10 @@
 Name = <%= @fqdn_tinc %>
 AddressFamily = ipv4
 Device = /dev/net/tun
-#PMTU = 1440
 Mode = <%= @mode %>
 
 BindToAddress = <%= @host_address %> <%= @port %>
 BindToInterface = <%= @tinc_interface.to_s %>
-
+<% @options.keys.sort.each do |key| -%>
+<%= key %> = <%= @options[key] %>
+<% end -%>