summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2012-09-27 15:41:07 +0200
committervarac <varacanero@zeromail.org>2012-09-27 15:41:07 +0200
commit4b31de05ad453fe6a0a69a5dae39424fa3d1c995 (patch)
treefe5c56a44295ce51b151efb3f77202238e1cb642 /config
parent7f9c8f7dee5a344f226df74becf9c30e69783b55 (diff)
cleaned hierdata
Diffstat (limited to 'config')
-rw-r--r--config/defaults.yaml4
-rw-r--r--config/eip/cougar.leap.se.yaml2
-rw-r--r--config/eip/defaults.yaml3
-rw-r--r--config/hosts/cougar.leap.se.yaml6
4 files changed, 10 insertions, 5 deletions
diff --git a/config/defaults.yaml b/config/defaults.yaml
index 62f047e3..44fae3d2 100644
--- a/config/defaults.yaml
+++ b/config/defaults.yaml
@@ -1,7 +1,7 @@
---
testpw: secret
-services: - none
+# as hashes will get aggregated, this ssh-key would always be present, in addition to others specified in hosts/{fqdn}
ssh_keys:
- test_key:
+ default_key:
key: ssh-rsa random_noiseAAdABIwAAAGEA3FSyQwBI6Z+nCSjUUk8EEAnnkhXlukKoppND/RRClWz2s5TCzIkd3Ou5+Cyz71X0XmazM3l5WgeErvtIwQMyT1KjNoMhoJMrJnWqQPOt5Q8zWd9qG7PBl9+eiH5qV7NZ
diff --git a/config/eip/cougar.leap.se.yaml b/config/eip/cougar.leap.se.yaml
index 2bbd71e0..c051d30b 100644
--- a/config/eip/cougar.leap.se.yaml
+++ b/config/eip/cougar.leap.se.yaml
@@ -7,4 +7,4 @@ openvpn_server_configs:
port: 1194
proto: udp
-#tor: 'false'
+tor: 'true'
diff --git a/config/eip/defaults.yaml b/config/eip/defaults.yaml
index 29022408..a56a34c8 100644
--- a/config/eip/defaults.yaml
+++ b/config/eip/defaults.yaml
@@ -1,5 +1,6 @@
---
# make shure 'false' is quoted
tor: 'false'
-openvpn_server_configs: -
+openvpn_server_configs:
+ none:
diff --git a/config/hosts/cougar.leap.se.yaml b/config/hosts/cougar.leap.se.yaml
index 5cf37bb1..dabeead4 100644
--- a/config/hosts/cougar.leap.se.yaml
+++ b/config/hosts/cougar.leap.se.yaml
@@ -1,3 +1,7 @@
---
services: - eip
- - couchdb
+ - couchdb
+ssh_keys:
+ second_key:
+ key: ssh-rsa more_random_noiseAAdABIwAAAGEA3FSyQwBI6Z+nCSjUUk8EEAnnkhXlukKoppND/RRClWz2s5TCzIkd3Ou5+Cyz71X0XmazM3l5WgeErvtIwQMyT1KjNoMhoJMrJnWqQPOt5Q8zWd9qG7PBl9+eiH5qV7NZ
+