From abc3df60e4f3e22185fd5ee8722276ec2ad22163 Mon Sep 17 00:00:00 2001
From: Martin Schuette <info@mschuette.name>
Date: Sun, 1 Jun 2014 21:52:25 +0200
Subject: [PATCH] ensure old & new bird version compatibility

---
 manifests/init.pp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 42b9efd..f137c46 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -436,6 +436,11 @@ class ff_gw::bird($ff_net, $ff_mesh_net, $ff_as, $own_ipv4, $own_ipv6, $gw_do_ic
   $ic_peerings_v4 = $peeringdata[ic_peerings_v4]
   $ic_peerings_v6 = $peeringdata[ic_peerings_v6]
 
+  # for compatibility with old & new bird versions
+  file { '/etc/bird':
+    ensure => directory;
+  }
+
   package {
     'bird6':
       ensure => $version,
@@ -444,10 +449,11 @@ class ff_gw::bird($ff_net, $ff_mesh_net, $ff_as, $own_ipv4, $own_ipv6, $gw_do_ic
   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';
+      ensure  => link,
+      target  => '/etc/bird/bird6.conf';
   }
   ~>
   service {
@@ -466,6 +472,7 @@ class ff_gw::bird($ff_net, $ff_mesh_net, $ff_as, $own_ipv4, $own_ipv6, $gw_do_ic
   file {
     '/etc/bird/bird.conf':
       ensure  => file,
+      require => File['/etc/bird'],
       content => template('ff_gw/etc/bird/bird.conf.erb');
     '/etc/bird.conf':
       ensure => link,