tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

network: Fixed rtadvd service name on OpenBSD

Browse source
This commit is contained in:
Ossi Salmi 2013-07-27 12:36:15 +03:00
parent 7904109460
commit 5bb9db292f
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
network/manifests/init.pp
View file

@ -597,6 +597,7 @@ class network::manager::disable {
# prefix => "2001:db8:c0de:cafe::/64" # prefix => "2001:db8:c0de:cafe::/64"
# } # }
define network::routeradvertisement::ipv6prefix($prefix = "", $description = "") { define network::routeradvertisement::ipv6prefix($prefix = "", $description = "") {
case $::operatingsystem { case $::operatingsystem {
"centos","redhat": { "centos","redhat": {
file { "/etc/radvd.conf.d": file { "/etc/radvd.conf.d":
@ -618,20 +619,19 @@ define network::routeradvertisement::ipv6prefix($prefix = "", $description = "")
ensure => directory, ensure => directory,
} }
file { "/etc/rtadvd.conf.d/rtadvd-${name}.conf": file { "/etc/rtadvd.conf.d/${name}.conf":
ensure => present, ensure => present,
mode => "0644", mode => "0644",
owner => "root", owner => "root",
group => "wheel", group => "wheel",
content => template("network/rtadvd.conf.erb"), content => template("network/rtadvd.conf.erb"),
before => Service["rtadvd-${name}"], notify => Service["rtadvd_${name}"],
notify => Service["rtadvd-${name}"],
} }
service { "rtadvd-${name}": service { "rtadvd_${name}":
ensure => running, ensure => running,
enable => true, enable => true,
start => "/usr/sbin/rtadvd -c /etc/rtadvd.conf.d/rtadvd-${name}.conf ${name}", start => "/usr/sbin/rtadvd -c /etc/rtadvd.conf.d/${name}.conf ${name}",
stop => "/usr/bin/pkill -f \"^/usr/sbin/rtadvd -c [^ ]+ ${name}\$\"", stop => "/usr/bin/pkill -f \"^/usr/sbin/rtadvd -c [^ ]+ ${name}\$\"",
status => "/usr/bin/pgrep -f \"^/usr/sbin/rtadvd -c [^ ]+ ${name}\$\"", status => "/usr/bin/pgrep -f \"^/usr/sbin/rtadvd -c [^ ]+ ${name}\$\"",
} }
@ -640,8 +640,10 @@ define network::routeradvertisement::ipv6prefix($prefix = "", $description = "")
fail("Router advertisement not supported in $::operatingsystem.") fail("Router advertisement not supported in $::operatingsystem.")
} }
} }
} }
# Router Advertisement daemon # Router Advertisement daemon
# #
class network::routeradvertisement { class network::routeradvertisement {