From 91d4d4711d664074247d2eb245bb6849a99b1bc3 Mon Sep 17 00:00:00 2001 From: Ossi Salmi Date: Wed, 4 Jan 2012 01:34:36 +0200 Subject: [PATCH] Fixed abusehelper module on OpenBSD --- abusehelper/manifests/init.pp | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/abusehelper/manifests/init.pp b/abusehelper/manifests/init.pp index 456cd48..c290af9 100644 --- a/abusehelper/manifests/init.pp +++ b/abusehelper/manifests/init.pp @@ -43,8 +43,11 @@ class abusehelper { file { "/usr/local/src/abusehelper.tar.gz": ensure => present, mode => 0644, - owner => root, - group => root, + owner => "root", + group => $operatingsystem ? { + "openbsd" => "wheel", + default => "root", + }, source => "puppet:///files/packages/${abusehelper_package}", links => follow, } @@ -58,8 +61,11 @@ class abusehelper { file { "/usr/local/src/idiokit.tar.gz": ensure => present, mode => 0644, - owner => root, - group => root, + owner => "root", + group => $operatingsystem ? { + "openbsd" => "wheel", + default => "root", + }, source => "puppet:///files/packages/${idiokit_package}", links => follow, } @@ -81,8 +87,8 @@ class abusehelper { file { "${abusehelper_datadir}": ensure => directory, mode => 0750, - owner => root, - group => abusehel, + owner => "root", + group => "abusehel", require => User["abusehel"], } @@ -95,8 +101,8 @@ class abusehelper { file { "/var/lib/ah2": ensure => directory, mode => 0750, - owner => root, - group => abusehel, + owner => "root", + group => "abusehel", require => User["abusehel"], } }