summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2012-10-12 22:07:19 +0200
committervarac <varacanero@zeromail.org>2012-10-12 22:07:19 +0200
commit3e11ce4c43282448b032f9ad8e31667fb4b85ccb (patch)
tree3bc95d3d627d00fbf496b157ec3a3593821b1879 /config
parentb8f727635254453503bd1d9b22e20d69cc23630a (diff)
parent0eff2049fa8d846dffee3236824b8bc42e581467 (diff)
Merge branch 'feature/eip' into develop
Diffstat (limited to 'config')
-rw-r--r--config/defaults.yaml7
-rw-r--r--config/eip/cougar.leap.se.yaml10
-rw-r--r--config/eip/defaults.yaml4
-rw-r--r--config/hosts/cougar.leap.se.yaml8
4 files changed, 0 insertions, 29 deletions
diff --git a/config/defaults.yaml b/config/defaults.yaml
deleted file mode 100644
index 44fae3d2..00000000
--- a/config/defaults.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-testpw: secret
-
-# as hashes will get aggregated, this ssh-key would always be present, in addition to others specified in hosts/{fqdn}
-ssh_keys:
- 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
deleted file mode 100644
index c051d30b..00000000
--- a/config/eip/cougar.leap.se.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-openvpn_server_configs:
- port80_tcp:
- port: 80
- proto: tcp-server
- port1194_udp:
- port: 1194
- proto: udp
-
-tor: 'true'
diff --git a/config/eip/defaults.yaml b/config/eip/defaults.yaml
deleted file mode 100644
index 07846fdd..00000000
--- a/config/eip/defaults.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-# make shure 'false' is quoted
-tor: 'false'
-
diff --git a/config/hosts/cougar.leap.se.yaml b/config/hosts/cougar.leap.se.yaml
deleted file mode 100644
index 758e96a3..00000000
--- a/config/hosts/cougar.leap.se.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-services:
- - eip
- - couchdb
-ssh_keys:
- second_key:
- key: ssh-rsa more_random_noiseAAdABIwAAAGEA3FSyQwBI6Z+nCSjUUk8EEAnnkhXlukKoppND/RRClWz2s5TCzIkd3Ou5+Cyz71X0XmazM3l5WgeErvtIwQMyT1KjNoMhoJMrJnWqQPOt5Q8zWd9qG7PBl9+eiH5qV7NZ
-