diff options
| author | elijah <elijah@riseup.net> | 2014-11-24 14:26:56 -0800 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2014-11-24 14:26:56 -0800 |
| commit | f2b9da8ea0f8a138af63f05fe1e43c90b237ebd7 (patch) | |
| tree | b3bf400f8c2a725027555de0fbe6beab14251664 /hiera/frog.yaml | |
| parent | 374a68a2d63b66d23a69b7922dea27b4d2a008c3 (diff) | |
| parent | 364a43d1ac65abd030baeddfc3eff763486cfe16 (diff) | |
Merge branch 'master' of ssh://leap.se/bitmask
Diffstat (limited to 'hiera/frog.yaml')
| -rw-r--r-- | hiera/frog.yaml | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/hiera/frog.yaml b/hiera/frog.yaml index 3c880d9..bfa81a1 100644 --- a/hiera/frog.yaml +++ b/hiera/frog.yaml @@ -19,9 +19,6 @@ location: ~ mail: smarthost: [] name: frog -platform: - major_version: "0.6" - version: "0.6" service_type: public_service services: - static @@ -327,9 +324,6 @@ static: tls_only: true formats: - amber -stunnel: - clients: {} - servers: {} tags: - production x509: @@ -394,9 +388,6 @@ x509: do1tnppn3G1Y2EW18zztBS+pykt5+kFJdDAfC5tL3SNh2er+croopzn/pg7NMaS8 7ri/3hdHttbqDQjAxbQPl1CkpyxgKbQQyPVXAMfm1xUVtw== -----END CERTIFICATE----- - commercial_ca_cert: ~ - commercial_cert: ~ - commercial_key: ~ key: | -----BEGIN RSA PRIVATE KEY----- MIIEpQIBAAKCAQEAw7CiUKaxU165suQ0h2/r3qWePJ6M7AE2rVNgQSi3w0EmYlKi @@ -426,4 +417,3 @@ x509: F0ZIjOlu8zvQIl+L9tpmtEELTG+8LMyycvh0bPq9baY/LhTvnFKzMHE= -----END RSA PRIVATE KEY----- use: true - use_commercial: false |