Merge branch 'master' of ssh://leap.se/bitmask

34 files changed, 34 insertions, 34 deletions

diff --git a/hiera/ant.yaml b/hiera/ant.yaml
index cbbf003..6adac68 100644
--- a/hiera/ant.yaml
+++ b/hiera/ant.yaml
@@ -91,7 +91,7 @@ mail:
 name: ant
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: internal_service
 services: 
   - couchdb
diff --git a/hiera/armadillo.yaml b/hiera/armadillo.yaml
index 0c83a2d..cabd125 100644
--- a/hiera/armadillo.yaml
+++ b/hiera/armadillo.yaml
@@ -85,7 +85,7 @@ mail:
 name: armadillo
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: internal_service
 services: 
   - couchdb
diff --git a/hiera/canvasback.yaml b/hiera/canvasback.yaml
index 2a33eba..7b46e0f 100644
--- a/hiera/canvasback.yaml
+++ b/hiera/canvasback.yaml
@@ -159,7 +159,7 @@ nickserver:
   port: 6425
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: public_service
 services: 
   - webapp
diff --git a/hiera/chameleon.yaml b/hiera/chameleon.yaml
index 38dbf52..68e2935 100644
--- a/hiera/chameleon.yaml
+++ b/hiera/chameleon.yaml
@@ -625,7 +625,7 @@ nickserver:
   port: 6425
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: public_service
 services: 
   - monitor
diff --git a/hiera/chipmonk.yaml b/hiera/chipmonk.yaml
index b37c2ee..dfe0af6 100644
--- a/hiera/chipmonk.yaml
+++ b/hiera/chipmonk.yaml
@@ -93,7 +93,7 @@ mynetworks:
 name: chipmonk
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: user_service
 services: 
   - mx
diff --git a/hiera/clam.yaml b/hiera/clam.yaml
index 58d43b7..fa16470 100644
--- a/hiera/clam.yaml
+++ b/hiera/clam.yaml
@@ -98,7 +98,7 @@ mail:
 name: clam
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: public_service
 services: 
   - couchdb
diff --git a/hiera/couch1.yaml b/hiera/couch1.yaml
index 27f2ebb..5318d9e 100644
--- a/hiera/couch1.yaml
+++ b/hiera/couch1.yaml
@@ -83,7 +83,7 @@ mail:
 name: couch1
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: public_service
 services: 
   - couchdb
diff --git a/hiera/couch2.yaml b/hiera/couch2.yaml
index fe5c6f9..c5e057a 100644
--- a/hiera/couch2.yaml
+++ b/hiera/couch2.yaml
@@ -83,7 +83,7 @@ mail:
 name: couch2
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: public_service
 services: 
   - couchdb
diff --git a/hiera/deer.yaml b/hiera/deer.yaml
index f54ae77..aeb83f5 100644
--- a/hiera/deer.yaml
+++ b/hiera/deer.yaml
@@ -32,7 +32,7 @@ mail:
 name: deer
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: internal_service
 services: 
   - tor
diff --git a/hiera/demodex.yaml b/hiera/demodex.yaml
index 0df05b8..c0ad5f3 100644
--- a/hiera/demodex.yaml
+++ b/hiera/demodex.yaml
@@ -32,7 +32,7 @@ mail:
 name: demodex
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: internal_service
 services: 
   - backup
diff --git a/hiera/elephant.yaml b/hiera/elephant.yaml
index c90e598..348b8a2 100644
--- a/hiera/elephant.yaml
+++ b/hiera/elephant.yaml
@@ -228,7 +228,7 @@ nickserver:
   port: 6425
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: public_service
 services: 
   - webapp
diff --git a/hiera/elk.yaml b/hiera/elk.yaml
index 44da86d..778183a 100644
--- a/hiera/elk.yaml
+++ b/hiera/elk.yaml
@@ -98,7 +98,7 @@ mail:
 name: elk
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: internal_service
 services: 
   - couchdb
diff --git a/hiera/frog.yaml b/hiera/frog.yaml
index 935392b..4e10ca9 100644
--- a/hiera/frog.yaml
+++ b/hiera/frog.yaml
@@ -26,7 +26,7 @@ mail:
 name: frog
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: public_service
 services: 
   - static
diff --git a/hiera/gadwall.yaml b/hiera/gadwall.yaml
index a853a20..48cdd8b 100644
--- a/hiera/gadwall.yaml
+++ b/hiera/gadwall.yaml
@@ -84,7 +84,7 @@ mail:
 name: gadwall
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: public_service
 services: 
   - couchdb
diff --git a/hiera/gorilla.yaml b/hiera/gorilla.yaml
index c4cfd14..7c67ee4 100644
--- a/hiera/gorilla.yaml
+++ b/hiera/gorilla.yaml
@@ -85,7 +85,7 @@ mail:
 name: gorilla
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: internal_service
 services: 
   - couchdb
diff --git a/hiera/hippo.yaml b/hiera/hippo.yaml
index 228c631..3b3d39c 100644
--- a/hiera/hippo.yaml
+++ b/hiera/hippo.yaml
@@ -58,7 +58,7 @@ openvpn:
   user_ips: false
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: user_service
 services: 
   - openvpn
diff --git a/hiera/ladybug.yaml b/hiera/ladybug.yaml
index 1a651bf..70b35c4 100644
--- a/hiera/ladybug.yaml
+++ b/hiera/ladybug.yaml
@@ -32,7 +32,7 @@ mail:
 name: ladybug
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: internal_service
 services: 
   - backup
diff --git a/hiera/leech.yaml b/hiera/leech.yaml
index 9e3c826..78f063f 100644
--- a/hiera/leech.yaml
+++ b/hiera/leech.yaml
@@ -105,7 +105,7 @@ mynetworks:
 name: leech
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: user_service
 services: 
   - mx
diff --git a/hiera/millipede.yaml b/hiera/millipede.yaml
index e428e23..989d162 100644
--- a/hiera/millipede.yaml
+++ b/hiera/millipede.yaml
@@ -60,7 +60,7 @@ openvpn:
   user_ips: false
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: user_service
 services: 
   - openvpn
diff --git a/hiera/monitor1.yaml b/hiera/monitor1.yaml
index 96cbc37..c615302 100644
--- a/hiera/monitor1.yaml
+++ b/hiera/monitor1.yaml
@@ -150,7 +150,7 @@ nagios:
 name: monitor1
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: internal_service
 services: 
   - monitor
diff --git a/hiera/mx1.yaml b/hiera/mx1.yaml
index 5890794..b5c6e0d 100644
--- a/hiera/mx1.yaml
+++ b/hiera/mx1.yaml
@@ -97,7 +97,7 @@ mynetworks:
 name: mx1
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: user_service
 services: 
   - mx
diff --git a/hiera/octopus.yaml b/hiera/octopus.yaml
index 4d776e7..6618a2f 100644
--- a/hiera/octopus.yaml
+++ b/hiera/octopus.yaml
@@ -93,7 +93,7 @@ mynetworks:
 name: octopus
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: user_service
 services: 
   - mx
diff --git a/hiera/otter.yaml b/hiera/otter.yaml
index abb8e3d..b810fe3 100644
--- a/hiera/otter.yaml
+++ b/hiera/otter.yaml
@@ -60,7 +60,7 @@ openvpn:
   user_ips: false
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: user_service
 services: 
   - openvpn
diff --git a/hiera/panda.yaml b/hiera/panda.yaml
index e8de077..e2553f1 100644
--- a/hiera/panda.yaml
+++ b/hiera/panda.yaml
@@ -84,7 +84,7 @@ mail:
 name: panda
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: public_service
 services: 
   - couchdb
diff --git a/hiera/plain1.yaml b/hiera/plain1.yaml
index 0e58816..0dcdf09 100644
--- a/hiera/plain1.yaml
+++ b/hiera/plain1.yaml
@@ -27,7 +27,7 @@ mail:
 name: plain1
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: internal_service
 services: []
 squid_deb_proxy_client: true
diff --git a/hiera/seahorse.yaml b/hiera/seahorse.yaml
index 9c9767e..1edae9f 100644
--- a/hiera/seahorse.yaml
+++ b/hiera/seahorse.yaml
@@ -60,7 +60,7 @@ openvpn:
   user_ips: false
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: user_service
 services: 
   - openvpn
diff --git a/hiera/snail.yaml b/hiera/snail.yaml
index 3957fb6..9540bfb 100644
--- a/hiera/snail.yaml
+++ b/hiera/snail.yaml
@@ -61,7 +61,7 @@ openvpn:
   user_ips: false
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: user_service
 services: 
   - openvpn
diff --git a/hiera/starfish.yaml b/hiera/starfish.yaml
index 05d4e59..e06514c 100644
--- a/hiera/starfish.yaml
+++ b/hiera/starfish.yaml
@@ -117,7 +117,7 @@ mynetworks:
 name: starfish
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: user_service
 services: 
   - mx
diff --git a/hiera/thrips.yaml b/hiera/thrips.yaml
index ff15ab5..b6596c1 100644
--- a/hiera/thrips.yaml
+++ b/hiera/thrips.yaml
@@ -92,7 +92,7 @@ mail:
 name: thrips
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: public_service
 services: 
   - couchdb
diff --git a/hiera/tor1.yaml b/hiera/tor1.yaml
index 3a3a698..8451dec 100644
--- a/hiera/tor1.yaml
+++ b/hiera/tor1.yaml
@@ -27,7 +27,7 @@ mail:
 name: tor1
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: internal_service
 services: 
   - tor
diff --git a/hiera/urchin.yaml b/hiera/urchin.yaml
index 5e32d12..cf845c7 100644
--- a/hiera/urchin.yaml
+++ b/hiera/urchin.yaml
@@ -99,7 +99,7 @@ mail:
 name: urchin
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: public_service
 services: 
   - couchdb
diff --git a/hiera/vpn1.yaml b/hiera/vpn1.yaml
index 26df7e1..9044837 100644
--- a/hiera/vpn1.yaml
+++ b/hiera/vpn1.yaml
@@ -57,7 +57,7 @@ openvpn:
   user_ips: false
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: user_service
 services: 
   - openvpn
diff --git a/hiera/wallaby.yaml b/hiera/wallaby.yaml
index 77ee2df..498106d 100644
--- a/hiera/wallaby.yaml
+++ b/hiera/wallaby.yaml
@@ -234,7 +234,7 @@ nickserver:
   port: 6425
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: public_service
 services: 
   - webapp
diff --git a/hiera/web1.yaml b/hiera/web1.yaml
index 1bbcb4d..58826ae 100644
--- a/hiera/web1.yaml
+++ b/hiera/web1.yaml
@@ -189,7 +189,7 @@ nickserver:
   port: 6425
 platform: 
   major_version: "0.6"
-  version: "0.6"
+  version: "0.6.1"
 service_type: public_service
 services: 
   - webapp