diff options
Diffstat (limited to 'lib/puppet/parser/functions')
-rw-r--r-- | lib/puppet/parser/functions/guess_apache_version.rb | 39 | ||||
-rw-r--r-- | lib/puppet/parser/functions/htpasswd_sha1.rb | 8 |
2 files changed, 0 insertions, 47 deletions
diff --git a/lib/puppet/parser/functions/guess_apache_version.rb b/lib/puppet/parser/functions/guess_apache_version.rb deleted file mode 100644 index 7537f6d9..00000000 --- a/lib/puppet/parser/functions/guess_apache_version.rb +++ /dev/null @@ -1,39 +0,0 @@ -# Try to guess the version of apache to be installed. -# Certain apache modules depend on each other, so we -# need to evaluate the apache version before it gets -# installed. This function decides which apache version -# is going to be installed based on the `operatingsystemrelease` -# fact. -module Puppet::Parser::Functions - newfunction(:guess_apache_version, :type => :rvalue) do |args| - release = lookupvar('operatingsystemrelease') - unknown = 'unknown' - - case lookupvar('operatingsystem') - - when 'Debian' - case release - when /^7.*/ - version = '2.2' - when /^8.*/ - version = '2.4' - else - version = unknown - end - - when 'Ubuntu' - case release - when /(12.04|12.10|13.04|13.10)/ - version = '2.2' - when /(14.04|14.10|15.04|15.10|16.04)/ - version = '2.4' - else - version = unknown - end - - else - version = unknown - end - version - end -end diff --git a/lib/puppet/parser/functions/htpasswd_sha1.rb b/lib/puppet/parser/functions/htpasswd_sha1.rb deleted file mode 100644 index 937621d9..00000000 --- a/lib/puppet/parser/functions/htpasswd_sha1.rb +++ /dev/null @@ -1,8 +0,0 @@ -require 'digest/sha1' -require 'base64' - -module Puppet::Parser::Functions - newfunction(:htpasswd_sha1, :type => :rvalue) do |args| - "{SHA}" + Base64.encode64(Digest::SHA1.digest(args[0])) - end -end |