From ff80daef1646d43673d442b59bcb7d10d99af0b6 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Sun, 31 Jul 2016 16:12:28 -0700 Subject: [PATCH] puppet: Move zulipsecret into its own file. Apparently puppet doesn't support declaring multiple functions in the same file. --- .../zulip/lib/puppet/parser/functions/zulipconf.rb | 11 ----------- .../zulip/lib/puppet/parser/functions/zulipsecret.rb | 12 ++++++++++++ 2 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 puppet/zulip/lib/puppet/parser/functions/zulipsecret.rb diff --git a/puppet/zulip/lib/puppet/parser/functions/zulipconf.rb b/puppet/zulip/lib/puppet/parser/functions/zulipconf.rb index aaddddbdf1..077e188f5c 100644 --- a/puppet/zulip/lib/puppet/parser/functions/zulipconf.rb +++ b/puppet/zulip/lib/puppet/parser/functions/zulipconf.rb @@ -9,15 +9,4 @@ module Puppet::Parser::Functions default end end - - newfunction(:zulipsecret, :type => :rvalue) do |args| - default = args.pop - joined = args.join(" ") - output = `/usr/bin/crudini --get /etc/zulip/zulip-secrets.conf #{joined} 2>&1`; result=$?.success? - if result - output.strip() - else - default - end - end end diff --git a/puppet/zulip/lib/puppet/parser/functions/zulipsecret.rb b/puppet/zulip/lib/puppet/parser/functions/zulipsecret.rb new file mode 100644 index 0000000000..b23dc98279 --- /dev/null +++ b/puppet/zulip/lib/puppet/parser/functions/zulipsecret.rb @@ -0,0 +1,12 @@ +module Puppet::Parser::Functions + newfunction(:zulipsecret, :type => :rvalue) do |args| + default = args.pop + joined = args.join(" ") + output = `/usr/bin/crudini --get /etc/zulip/zulip-secrets.conf #{joined} 2>&1`; result=$?.success? + if result + output.strip() + else + default + end + end +end