diff options
| author | varac <varacanero@zeromail.org> | 2013-08-10 20:20:13 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-08-10 20:20:13 +0200 |
| commit | 3ee1d666927fcb440b8ef22d35246a175277c605 (patch) | |
| tree | 89c37f4479ba5167668e15d3434cdabf87042385 /templates | |
| parent | f1da3f6ffe640f45ab74521f55389af504375b74 (diff) | |
fix variable scope for $custom_hostname
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/ipsec.conf.erb | 4 | ||||
| -rw-r--r-- | templates/remote_host.erb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/templates/ipsec.conf.erb b/templates/ipsec.conf.erb index c61b765..6912c16 100644 --- a/templates/ipsec.conf.erb +++ b/templates/ipsec.conf.erb @@ -13,8 +13,8 @@ conn %default rightsendcert=never leftsendcert=never left=<%= scope.lookupvar('strongswan::default_left_ip_address') %> - leftcert=<%= scope.lookupvar('custom_hostname') %>.asc - leftid=@<%= scope.lookupvar('custom_hostname') %> + leftcert=<%= scope.lookupvar('strongswan::custom_hostname') %>.asc + leftid=@<%= scope.lookupvar('strongswan::custom_hostname') %> <% unless (subn=scope.lookupvar('strongswan::default_left_subnet')).empty? -%> leftsubnet=<%= subn.collect{|s| s.include?('/') ? s : (s.include?(':') ? "#{s}/128" : "#{s}/32" ) }.join(',') %> <% end -%> diff --git a/templates/remote_host.erb b/templates/remote_host.erb index 2c70a37..207e25b 100644 --- a/templates/remote_host.erb +++ b/templates/remote_host.erb @@ -1,5 +1,5 @@ # host <%= name %> -<% if !(right_id =~ /#{scope.lookupvar('custom_hostname')}/) -%> +<% if !(right_id =~ /#{scope.lookupvar('strongswan::custom_hostname')}/) -%> conn <%= name %> <% if left_ip_address != 'absent' -%> left=<%= left_ip_address %> |