From d0b85c756d7bcdfa20d10a6c8b68560583c2fc62 Mon Sep 17 00:00:00 2001 From: Pasi Sjoholm Date: Wed, 23 Apr 2014 09:45:39 +0000 Subject: [PATCH 1/2] fix leftsubnet & libgmp for wheezy --- manifests/params.pp | 2 +- templates/connection.conf.erb | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/manifests/params.pp b/manifests/params.pp index c385037..1380ab8 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -21,7 +21,7 @@ case $::operatingsystem { debian,ubuntu: { - $package_list = ['libgmp3c2', 'openswan', 'lsof'] + $package_list = ['libgmp10', 'openswan', 'lsof'] $service_name = 'ipsec' } default: { } diff --git a/templates/connection.conf.erb b/templates/connection.conf.erb index b1a9e17..c07178e 100644 --- a/templates/connection.conf.erb +++ b/templates/connection.conf.erb @@ -20,6 +20,9 @@ conn <%= @name %> <% if @left -%> left=<%= @left %> <% end -%> +<% if @leftsubnet -%> + leftsubnet=<%= @leftsubnet %> +<% end -%> <% if @leftnexthop -%> leftnexthop=<%= @leftnexthop %> <% end -%> From 8164e1dcbcff8d550dba4fc0c3102133281e57f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pasi=20Sj=C3=B6holm?= Date: Wed, 23 Apr 2014 17:16:55 +0300 Subject: [PATCH 2/2] add leftid --- manifests/connection.pp | 1 + templates/connection.conf.erb | 3 +++ 2 files changed, 4 insertions(+) diff --git a/manifests/connection.pp b/manifests/connection.pp index 92411cc..74132e2 100644 --- a/manifests/connection.pp +++ b/manifests/connection.pp @@ -7,6 +7,7 @@ $leftsubnet = undef, $leftprotoport = undef, $leftnexthop = undef, + $leftid = undef, $pfs = undef, $rekey = undef, $right = undef, diff --git a/templates/connection.conf.erb b/templates/connection.conf.erb index c07178e..08f25f5 100644 --- a/templates/connection.conf.erb +++ b/templates/connection.conf.erb @@ -29,6 +29,9 @@ conn <%= @name %> <% if @leftprotoport -%> leftprotoport=<%= @leftprotoport %> <% end -%> +<% if @leftid -%> + leftid=<%= @leftid %> +<% end -%> <% if @right -%> right=<%= @right %> <% end -%>