From e23c67c8f3f53dcf32562012d70ab4bf8ba2e8fd Mon Sep 17 00:00:00 2001 From: Ossi Salmi Date: Fri, 9 Sep 2016 10:05:42 +0300 Subject: [PATCH] wiki: Add global variable for moin patch --- wiki/manifests/init.pp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/wiki/manifests/init.pp b/wiki/manifests/init.pp index 6182280..8fbf9df 100644 --- a/wiki/manifests/init.pp +++ b/wiki/manifests/init.pp @@ -2,15 +2,17 @@ # class wiki::moin { - if !$moin_package { - if $moin_package_latest { - $moin_package = $moin_package_latest + if ! $moin_package { + if $::moin_package_latest { + $moin_package = $::moin_package_latest } else { fail("Must define \$moin_package or \$moin_package_latest") } } - $moin_patch = regsubst($moin_package, '\.tar\.gz', '.patch') + if ! $moin_patch { + $moin_patch = regsubst($moin_package, '\.tar\.gz', '.patch') + } file { "/usr/local/src/moin.tar.gz": ensure => present,