From 75e57c74d5aa0595e02435ca4de15b9df1cc6002 Mon Sep 17 00:00:00 2001 From: varac Date: Fri, 21 Sep 2012 12:45:36 +0200 Subject: parsing of hiera config hash works --- config/eip/cougar.leap.se.yaml | 12 ++++++++---- config/eip/defaults.yml | 5 +---- 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'config/eip') diff --git a/config/eip/cougar.leap.se.yaml b/config/eip/cougar.leap.se.yaml index 39926616..d98787d0 100644 --- a/config/eip/cougar.leap.se.yaml +++ b/config/eip/cougar.leap.se.yaml @@ -1,5 +1,9 @@ --- -openvpn_ports: - 80 - - 443 - - 1194 -tor: 'true' +openvpn: + port80_tcp: + port: 80 + protocol: tcp + port1194_udp: + port: 1194 + protocol: udp +tor: 'false' diff --git a/config/eip/defaults.yml b/config/eip/defaults.yml index 7be713b5..fab63a5c 100644 --- a/config/eip/defaults.yml +++ b/config/eip/defaults.yml @@ -1,7 +1,4 @@ --- - # make shure 'false' is quoted tor: 'false' -openvpn_ports: - 80 - - 443 - - 1194 +openvpn: -- cgit v1.2.3