From a734032c5dfe6df46e5e096b4ae2393939356c6a Mon Sep 17 00:00:00 2001
From: Martin Schuette <info@mschuette.name>
Date: Sun, 1 Jun 2014 22:19:28 +0200
Subject: [PATCH] bird6 depends on bird

---
 manifests/init.pp | 47 ++++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index ea2b5ff..b16627f 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -445,29 +445,6 @@ class ff_gw::bird($ff_net, $ff_mesh_net, $ff_as, $own_ipv4, $own_ipv6, $gw_do_ic
     ensure => directory;
   }
 
-  package {
-    'bird6':
-      ensure => $version,
-  }
-  ->
-  file {
-    '/etc/bird/bird6.conf':
-      ensure  => file,
-      require => File['/etc/bird'],
-      content => template('ff_gw/etc/bird/bird6.conf.erb');
-    '/etc/bird6.conf':
-      ensure  => link,
-      target  => '/etc/bird/bird6.conf';
-  }
-  ~>
-  service {
-    'bird6':
-      ensure  => running,
-      enable  => true,
-      require => Service['openvpn'],
-  }
-
-
   package {
     'bird':
       ensure => $version,
@@ -489,6 +466,30 @@ class ff_gw::bird($ff_net, $ff_mesh_net, $ff_as, $own_ipv4, $own_ipv6, $gw_do_ic
       enable  => true,
       require => Service['openvpn'],
   }
+
+  package {
+    'bird6':
+      ensure  => $version,
+      require => Package['bird'],
+  }
+  ->
+  file {
+    '/etc/bird/bird6.conf':
+      ensure  => file,
+      require => File['/etc/bird'],
+      content => template('ff_gw/etc/bird/bird6.conf.erb');
+    '/etc/bird6.conf':
+      ensure  => link,
+      target  => '/etc/bird/bird6.conf';
+  }
+  ~>
+  service {
+    'bird6':
+      ensure  => running,
+      enable  => true,
+      require => Service['openvpn'],
+  }
+
 }
 
 class ff_gw::tinc($tinc_name, $tinc_keyfile, $ic_vpn_ip4, $ic_vpn_ip6, $version = 'present') {