tohe
/
7u83-ipsec
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some bug fixes

This commit is contained in:
7u83 2018-03-07 14:40:57 +01:00
parent c5bf01d089
commit 197fe3acad
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/racoon.pp
View File

@ -43,8 +43,8 @@ class ipsec::racoon (
concat { "$ipsec_conf": concat { "$ipsec_conf":
ensure => present ensure => present,
require => Package['racoon']
} }
concat::fragment { "ipsec_conf_header": concat::fragment { "ipsec_conf_header":
@ -57,7 +57,8 @@ class ipsec::racoon (
owner => "$racoon_usr", owner => "$racoon_usr",
group => "$racoon_grp", group => "$racoon_grp",
mode => '0600', mode => '0600',
ensure => present ensure => present,
require => Package['racoon']
} }
concat::fragment { "pskfile_header": concat::fragment { "pskfile_header":

4
templates/racoon/ipsec.conf.transport.erb
View File

@ -4,7 +4,7 @@
# #
spdadd <%= @local_ip %> <%= @remote_ip %> <%= @proto %> -P out ipsec spdadd <%= @local_ip %> <%= @remote_ip %> <%= @proto %> -P out ipsec
esp/transport//require; esp/transport//unique;
spdadd <%= @remote_ip %> <%= @local_ip %> <%= @proto %> -P out ipsec spdadd <%= @remote_ip %> <%= @local_ip %> <%= @proto %> -P out ipsec
esp/transport//require; esp/transport//unique;

4
templates/racoon/ipsec.conf.tunnel.erb
View File

@ -6,8 +6,8 @@
<%- @netproto = net['proto'] ? net['proto'] : 'any' -%> <%- @netproto = net['proto'] ? net['proto'] : 'any' -%>
spdadd <%= net['local'] %> <%= net['remote'] %> <%= @netproto %> -P out ipsec 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 spdadd <%= net['remote'] %> <%= net['local'] %> <%= @netproto %> -P in ipsec
esp/tunnel/<%= @remote_ip %>-<%= @local_ip %>/require; esp/tunnel/<%= @remote_ip %>-<%= @local_ip %>/unique;
<%- end -%> <%- end -%>

2
templates/strongswan/ipsec.conf.tunnel.erb
View File

@ -4,7 +4,7 @@
<%- @pfs_group = net['pfs_group'] ? net['pfs_group'] : @dh_group -%> <%- @pfs_group = net['pfs_group'] ? net['pfs_group'] : @dh_group -%>
<%- @p2hash = net['hash'] ? net['hash'] : @hash -%> <%- @p2hash = net['hash'] ? net['hash'] : @hash -%>
conn "<%= @title %>" conn "<%= @title %> <%= net['local'] %> <%= net['remote']%>"
left=<%= @local_ip %> left=<%= @local_ip %>
leftsubnet=<%= net['local'] %> leftsubnet=<%= net['local'] %>
right=<%= @remote_ip %> right=<%= @remote_ip %>