From 24b8eef4a21b8cf3958e6f04666aa062feb96350 Mon Sep 17 00:00:00 2001 From: Ossi Salmi Date: Fri, 15 Aug 2014 23:47:49 +0300 Subject: [PATCH] custom: Lint fixes --- custom/manifests/init.pp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/custom/manifests/init.pp b/custom/manifests/init.pp index d95ec8c..5cdfa72 100644 --- a/custom/manifests/init.pp +++ b/custom/manifests/init.pp @@ -1,10 +1,11 @@ - +# Custom default settings. +# class custom { file { "/srv": ensure => directory, mode => "0755", - owner => root, + owner => "root", group => $::operatingsystem ? { OpenBSD => wheel, default => root, @@ -45,10 +46,10 @@ class custom { # source => "http://puppetlabs.com/downloads/puppet/puppet-2.6.2.tar.gz", # } # -define custom::file($ensure, $group="NONE", $mode="NONE", $owner="NONE", $seltype="NONE", $source) { +define custom::file($ensure, $source, $group="NONE", $mode="NONE", $owner="NONE", $seltype="NONE") { $test = regsubst($source, '^([^:]+)://.+$', '\1') - if "${test}" == "${source}" { + if $test == $source { $method = "file" $path = $source } else { @@ -60,6 +61,7 @@ define custom::file($ensure, $group="NONE", $mode="NONE", $owner="NONE", $seltyp $fetch_cmd = "wget -q -O '${name}' '${source}'" $diff_cmd = "wget -N --spider '${source}' 2>&1 | fgrep 'Server file no newer than local file'" } + default: { } } case $method {