From: Stephen Gran Date: Mon, 23 Apr 2012 10:20:48 +0000 (+0100) Subject: add site::sysctl to bsd X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=d2291529368816f55caaf1179fd75c6d56e35938 add site::sysctl to bsd Signed-off-by: Stephen Gran --- diff --git a/modules/kfreebsd/manifests/init.pp b/modules/kfreebsd/manifests/init.pp index 8ccfe318..8d2cf796 100644 --- a/modules/kfreebsd/manifests/init.pp +++ b/modules/kfreebsd/manifests/init.pp @@ -4,7 +4,8 @@ class kfreebsd { } site::sysctl { 'maxfiles': - key => 'kern.maxfiles', - value => 65536, + key => 'kern.maxfiles', + value => 65536, + target => 'GNU/kFreeBSD', } } diff --git a/modules/site/manifests/init.pp b/modules/site/manifests/init.pp index ca4d8a65..8fe1dafa 100644 --- a/modules/site/manifests/init.pp +++ b/modules/site/manifests/init.pp @@ -8,4 +8,10 @@ class site { hasstatus => false, status => '/bin/true', } + + file { '/etc/sysctl.d/': + ensure => directory, + mode => '0755' + } + } diff --git a/modules/site/manifests/sysctl.pp b/modules/site/manifests/sysctl.pp index 49a6be43..72b8e3d8 100644 --- a/modules/site/manifests/sysctl.pp +++ b/modules/site/manifests/sysctl.pp @@ -1,4 +1,4 @@ -define site::sysctl ($key, $value, $ensure = present) { +define site::sysctl ($key, $value, $target=Linux, $ensure = present) { include site case $ensure { present: {} @@ -6,7 +6,7 @@ define site::sysctl ($key, $value, $ensure = present) { default: { fail ( "Unknown ensure value: '$ensure'" ) } } - if $::kernel == 'Linux' { + if $::kernel == $target { file { "/etc/sysctl.d/${name}.conf": ensure => $ensure,