From 770bc48ae57ca4ffb8294c8f96841a28ade8a9cf Mon Sep 17 00:00:00 2001 From: mh Date: Fri, 4 Jan 2013 16:40:17 +0100 Subject: make it possible to also define left parts --- manifests/remote_host.pp | 3 +++ templates/remote_host.erb | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/manifests/remote_host.pp b/manifests/remote_host.pp index de7a729..059d969 100644 --- a/manifests/remote_host.pp +++ b/manifests/remote_host.pp @@ -3,6 +3,9 @@ define strongswan::remote_host( $right_ip_address, $right_subnet = [], $ensure = 'present', + $left_id = 'absent', + $left_ip_address = 'absent', + $left_subnet = [], $right_id = $name, $right_cert_name = $name, $right_cert_content = 'absent' diff --git a/templates/remote_host.erb b/templates/remote_host.erb index a05378c..9dff955 100644 --- a/templates/remote_host.erb +++ b/templates/remote_host.erb @@ -1,5 +1,14 @@ # host <%= name %> conn <%= name %> +<% if left_ip_address != 'absent' -%> + left=<%= left_ip_address %> +<% end -%> +<% if left_id != 'absent' -%> + leftid=<%= left_id %> +<% end -%> +<% unless left_subnet.empty? %> + leftsubnet=<%= left_subnet.collect{|s| s.include?('/') ? s : (s.include?(':') ? "#{s}/128" : "#{s}/32" ) }.join(',') %> +<% end -%> right=<%= right_ip_address %> rightid=@<%= right_id %> rightcert=<%= right_cert_name %>.asc -- cgit v1.2.3