From 5c7ce0a1c90ab1c0844369882f7fcdb6ff05c16d Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 20 Sep 2012 13:39:00 +0200
Subject: new config layout

---
 config/defaults.yaml             | 1 +
 config/eip/cougar.leap.se.yaml   | 5 +++++
 config/eip/defaults.yml          | 7 +++++++
 config/hosts/cougar.leap.se.yaml | 6 +++---
 config/services/eip.yaml         | 5 -----
 puppet/hiera.yaml                | 5 ++++-
 6 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100644 config/eip/cougar.leap.se.yaml
 create mode 100644 config/eip/defaults.yml
 delete mode 100644 config/services/eip.yaml

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/eip/cougar.leap.se.yaml b/config/eip/cougar.leap.se.yaml
new file mode 100644
index 00000000..39926616
--- /dev/null
+++ b/config/eip/cougar.leap.se.yaml
@@ -0,0 +1,5 @@
+---
+openvpn_ports:  - 80
+                - 443
+                - 1194
+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/config/services/eip.yaml b/config/services/eip.yaml
deleted file mode 100644
index d8ac5a4f..00000000
--- a/config/services/eip.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-openvpn_ports:  - 80
-                - 443
-                - 1194
-tor: false
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 
-- 
cgit v1.2.3