From 197fe3acad1fa0e2341611a08bdbd0ee70ee6c88 Mon Sep 17 00:00:00 2001
From: 7u83 <7u83@mail.ru>
Date: Wed, 7 Mar 2018 14:40:57 +0100
Subject: [PATCH] Some bug fixes

---
 manifests/racoon.pp                        | 7 ++++---
 templates/racoon/ipsec.conf.transport.erb  | 4 ++--
 templates/racoon/ipsec.conf.tunnel.erb     | 4 ++--
 templates/strongswan/ipsec.conf.tunnel.erb | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/manifests/racoon.pp b/manifests/racoon.pp
index 756f42d..5a18f03 100644
--- a/manifests/racoon.pp
+++ b/manifests/racoon.pp
@@ -43,8 +43,8 @@ class ipsec::racoon (
 
 
 	concat { "$ipsec_conf": 
-		ensure => present
-
+		ensure => present,
+		require => Package['racoon']
 	}
 
 	concat::fragment { "ipsec_conf_header":
@@ -57,7 +57,8 @@ class ipsec::racoon (
 		owner => "$racoon_usr",
 		group => "$racoon_grp",
 		mode  => '0600',
-		ensure => present
+		ensure => present,
+		require => Package['racoon']
 
 	}
 	concat::fragment { "pskfile_header":
diff --git a/templates/racoon/ipsec.conf.transport.erb b/templates/racoon/ipsec.conf.transport.erb
index 50c0970..e0d5158 100644
--- a/templates/racoon/ipsec.conf.transport.erb
+++ b/templates/racoon/ipsec.conf.transport.erb
@@ -4,7 +4,7 @@
 #
 
 spdadd <%= @local_ip %> <%= @remote_ip %> <%= @proto %> -P out ipsec 
-	esp/transport//require;
+	esp/transport//unique;
 spdadd <%= @remote_ip %> <%= @local_ip %> <%= @proto %> -P out ipsec 
-	esp/transport//require;
+	esp/transport//unique;
 
diff --git a/templates/racoon/ipsec.conf.tunnel.erb b/templates/racoon/ipsec.conf.tunnel.erb
index 5b82518..0fd14c0 100644
--- a/templates/racoon/ipsec.conf.tunnel.erb
+++ b/templates/racoon/ipsec.conf.tunnel.erb
@@ -6,8 +6,8 @@
 <%- @netproto = net['proto'] ? net['proto'] : 'any' -%>
 
 spdadd <%= net['local'] %> <%= net['remote'] %> <%= @netproto %> -P out ipsec 
-	esp/tunnel/<%= @local_ip %>-<%= @remote_ip %>/require;
+	esp/tunnel/<%= @local_ip %>-<%= @remote_ip %>/unique;
 spdadd <%= net['remote'] %> <%= net['local'] %> <%= @netproto %> -P in ipsec 
-	esp/tunnel/<%= @remote_ip %>-<%= @local_ip %>/require;
+	esp/tunnel/<%= @remote_ip %>-<%= @local_ip %>/unique;
 <%- end -%>
 
diff --git a/templates/strongswan/ipsec.conf.tunnel.erb b/templates/strongswan/ipsec.conf.tunnel.erb
index c162cf7..348e969 100644
--- a/templates/strongswan/ipsec.conf.tunnel.erb
+++ b/templates/strongswan/ipsec.conf.tunnel.erb
@@ -4,7 +4,7 @@
 <%- @pfs_group = net['pfs_group'] ? net['pfs_group'] : @dh_group -%>
 <%- @p2hash = net['hash'] ? net['hash'] : @hash  -%>
 
-conn "<%= @title %>"
+conn "<%= @title %> <%= net['local'] %> <%= net['remote']%>"
         left=<%= @local_ip %>
 	leftsubnet=<%= net['local'] %>
 	right=<%= @remote_ip %>