diff options
| author | varac <varacanero@zeromail.org> | 2012-09-21 12:45:36 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2012-09-21 12:45:36 +0200 |
| commit | 75e57c74d5aa0595e02435ca4de15b9df1cc6002 (patch) | |
| tree | cc86d4802cef07a6db48e19c471848c816288401 /config | |
| parent | 1a0d1907b303c2ab1e8da2a26e061e8a7327241e (diff) | |
parsing of hiera config hash works
Diffstat (limited to 'config')
| -rw-r--r-- | config/eip/cougar.leap.se.yaml | 12 | ||||
| -rw-r--r-- | config/eip/defaults.yml | 5 | ||||
| -rw-r--r-- | config/hosts/cougar.leap.se.yaml | 1 |
3 files changed, 9 insertions, 9 deletions
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: diff --git a/config/hosts/cougar.leap.se.yaml b/config/hosts/cougar.leap.se.yaml index 312d0141..5cf37bb1 100644 --- a/config/hosts/cougar.leap.se.yaml +++ b/config/hosts/cougar.leap.se.yaml @@ -1,4 +1,3 @@ --- -# varac's local machine services: - eip - couchdb |