freifunk/puppet-ff_gw
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

ensure old & new bird version compatibility

Browse source
This commit is contained in:
Martin Schuette 2014-06-01 21:52:25 +02:00
parent 125baa50e4
commit abc3df60e4
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
manifests/init.pp
View file

@ -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_v4 = $peeringdata[ic_peerings_v4]
$ic_peerings_v6 = $peeringdata[ic_peerings_v6] $ic_peerings_v6 = $peeringdata[ic_peerings_v6]
# for compatibility with old & new bird versions
file { '/etc/bird':
ensure => directory;
}
package { package {
'bird6': 'bird6':
ensure => $version, 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 { file {
'/etc/bird/bird6.conf': '/etc/bird/bird6.conf':
ensure => file, ensure => file,
require => File['/etc/bird'],
content => template('ff_gw/etc/bird/bird6.conf.erb'); content => template('ff_gw/etc/bird/bird6.conf.erb');
'/etc/bird6.conf': '/etc/bird6.conf':
ensure => link, ensure => link,
target => '/etc/bird/bird6.conf'; target => '/etc/bird/bird6.conf';
} }
~> ~>
service { service {
@ -466,6 +472,7 @@ class ff_gw::bird($ff_net, $ff_mesh_net, $ff_as, $own_ipv4, $own_ipv6, $gw_do_ic
file { file {
'/etc/bird/bird.conf': '/etc/bird/bird.conf':
ensure => file, ensure => file,
require => File['/etc/bird'],
content => template('ff_gw/etc/bird/bird.conf.erb'); content => template('ff_gw/etc/bird/bird.conf.erb');
'/etc/bird.conf': '/etc/bird.conf':
ensure => link, ensure => link,