7 files changed, 16 insertions, 6 deletions
diff --git a/.gitmodules b/.gitmodules
index 8f2fd482..c95048d9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,3 +22,9 @@
 [submodule "puppet/modules/common"]
 	path = puppet/modules/common
 	url = git://labs.riseup.net/shared-common
+[submodule "puppet/modules/shorewall"]
+	path = puppet/modules/shorewall
+	url = git://labs.riseup.net/shared-shorewall
+[submodule "puppet/modules/resolvconf"]
+	path = puppet/modules/resolvconf
+	url = git://git.puppet.immerda.ch/module-resolvconf.git
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..07846fdd 100644
--- a/config/eip/defaults.yaml
+++ b/config/eip/defaults.yaml
@@ -1,5 +1,4 @@
 ---
 # make shure 'false' is quoted  
 tor: 'false'
-openvpn_server_configs: -
 
diff --git a/config/hosts/cougar.leap.se.yaml b/config/hosts/cougar.leap.se.yaml
index 5cf37bb1..758e96a3 100644
--- a/config/hosts/cougar.leap.se.yaml
+++ b/config/hosts/cougar.leap.se.yaml
@@ -1,3 +1,8 @@
 ---
-services: - eip 
-          - couchdb 
+services: 
+  - eip 
+  - couchdb
+ssh_keys:
+  second_key:
+    key: ssh-rsa more_random_noiseAAdABIwAAAGEA3FSyQwBI6Z+nCSjUUk8EEAnnkhXlukKoppND/RRClWz2s5TCzIkd3Ou5+Cyz71X0XmazM3l5WgeErvtIwQMyT1KjNoMhoJMrJnWqQPOt5Q8zWd9qG7PBl9+eiH5qV7NZ
+ 
diff --git a/puppet/modules/resolvconf b/puppet/modules/resolvconf
new file mode 160000
+Subproject c7eca077fdda063edc96d3bea02c4774569e4b1
diff --git a/puppet/modules/shorewall b/puppet/modules/shorewall
new file mode 160000
+Subproject 911cc18e594bb5a3ab642ebb24615a0447050c3