From bb4d2d81b470c2efdb7bff74f39c229b2775dc4d Mon Sep 17 00:00:00 2001
From: 7u83 <7u83@mail.ru>
Date: Tue, 13 Mar 2018 18:20:40 +0100
Subject: [PATCH] lifetime settings enabled

---
 templates/racoon/racoon.conf.erb           | 6 +++---
 templates/strongswan/ipsec.conf.tunnel.erb | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/templates/racoon/racoon.conf.erb b/templates/racoon/racoon.conf.erb
index 8806206..ef9b3f1 100644
--- a/templates/racoon/racoon.conf.erb
+++ b/templates/racoon/racoon.conf.erb
@@ -8,14 +8,14 @@ remote <%= @remote_ip %> {
 		encryption_algorithm <%= @encryption %>;
 		hash_algorithm <%= @hash %>;
 		dh_group <%= @dh_group %>;
-		lifetime time <%= @lifetime %>;
+		lifetime time <%= @lifetime %> sec;
                 authentication_method pre_shared_key;
         }
        # generate_policy on;
 }
 
 <% @nets.each do |net| -%>
-	<%- @salifetime = net['lifetime'] ? net['lifetime'] : "3600 sec" %>
+	<%- @salifetime = net['lifetime'] ? net['lifetime'] : "3600 " %>
 	<%- @saencryption = net['encryption'] ? net['encryption'] : @encryption %>
 	<%- @pfs_group = net['pfs_group'] ? net['pfs_group'] : @dh_group %>
 	<%- @p2hash = net['hash'] ? net['hash'] : @hash  %>
@@ -29,7 +29,7 @@ sainfo address <%= net['local'] %> <%= @netproto %> address <%= net['remote'] %>
 	<%- @komma="" -%>
 	authentication_algorithm <%- @p2hash.each do |hmalgo| -%><%=@komma -%>hmac_<%= hmalgo -%> <%- @komma=',' -%> <%- end -%>; 
 	compression_algorithm deflate;
-	lifetime time <%= @salifetime %>;
+	lifetime time <%= @salifetime %> sec;
 }
 <% end -%>
 
diff --git a/templates/strongswan/ipsec.conf.tunnel.erb b/templates/strongswan/ipsec.conf.tunnel.erb
index 348e969..6f41d07 100644
--- a/templates/strongswan/ipsec.conf.tunnel.erb
+++ b/templates/strongswan/ipsec.conf.tunnel.erb
@@ -5,6 +5,9 @@
 <%- @p2hash = net['hash'] ? net['hash'] : @hash  -%>
 
 conn "<%= @title %> <%= net['local'] %> <%= net['remote']%>"
+	ikelifetime=<%= @lifetime %>s
+	lifetime=<%= @salifetime %>s
+
         left=<%= @local_ip %>
 	leftsubnet=<%= net['local'] %>
 	right=<%= @remote_ip %>
@@ -14,7 +17,7 @@ conn "<%= @title %> <%= net['local'] %> <%= net['remote']%>"
 	esp= <%- @saencryption.each do |saenc| -%> <%- @p2hash.each do |p2h| -%><%= @komma -%><%= saenc %>-<%= p2h %>-<%= @pfs_group -%> <%- @komma=',' %><%- end -%> <%- end -%>
 
 
-	auto=start
+	auto=route
 	authby=secret
         keyexchange=ikev1
 <% end -%>