new config layout

5 files changed, 16 insertions, 5 deletions

diff --git a/config/defaults.yaml b/config/defaults.yaml
index 3126c897..17fa03bf 100644
--- a/config/defaults.yaml
+++ b/config/defaults.yaml
@@ -1,2 +1,3 @@
 ---
 testpw: secret
+services: - 
diff --git a/config/services/eip.yaml b/config/eip/cougar.leap.se.yaml
index d8ac5a4f..39926616 100644
--- a/config/services/eip.yaml
+++ b/config/eip/cougar.leap.se.yaml
@@ -2,4 +2,4 @@
 openvpn_ports:  - 80
                 - 443
                 - 1194
-tor: false
+tor: 'true' 
diff --git a/config/eip/defaults.yml b/config/eip/defaults.yml
new file mode 100644
index 00000000..7be713b5
--- /dev/null
+++ b/config/eip/defaults.yml
@@ -0,0 +1,7 @@
+---
+
+# make shure 'false' is quoted  
+tor: 'false'
+openvpn_ports:  - 80
+                - 443
+                - 1194
diff --git a/config/hosts/cougar.leap.se.yaml b/config/hosts/cougar.leap.se.yaml
index ebd58979..312d0141 100644
--- a/config/hosts/cougar.leap.se.yaml
+++ b/config/hosts/cougar.leap.se.yaml
@@ -1,4 +1,4 @@
 ---
-openvpn_ports:  - 999
-                - 1000
-tor: true
+# varac's local machine
+services: - eip 
+          - couchdb 
diff --git a/puppet/hiera.yaml b/puppet/hiera.yaml
index 764966a2..66efa299 100644
--- a/puppet/hiera.yaml
+++ b/puppet/hiera.yaml
@@ -7,7 +7,10 @@
 
 :hierarchy:
   - hosts/%{fqdn}
-#  - services/%{service}     # that's not possible, as hiera needs _one_ target per hierarchy
+  - ca/%{fqdn}
+  - ca/defaults
+  - eip/%{fqdn}
+  - eip/defaults
   - defaults
 
 # relative from where puppet is run, so we need to run puppet