aboutsummaryrefslogtreecommitdiff
path: root/lib/puppet
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-03-31 14:50:07 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-03-31 14:50:07 -0300
commitb65996f7ae03d2bae118855a3c4d94a3947e556d (patch)
tree5bab8e5c3663aaabca34ebcee3c706c4fbc35cb5 /lib/puppet
parentb0425c65ecc61c6af3f31fba577b1e1c5d880674 (diff)
parent8c8bd7bb1e5cc0f5297db9629ece783452233d1f (diff)
downloadpuppet-apt-b65996f7ae03d2bae118855a3c4d94a3947e556d.tar.gz
puppet-apt-b65996f7ae03d2bae118855a3c4d94a3947e556d.tar.bz2
Merge remote-tracking branch 'shared/master' into developHEADmasterdevelop
Conflicts: README files/Debian/50unattended-upgrades.lenny files/Debian/50unattended-upgrades.wheezy manifests/init.pp manifests/params.pp manifests/unattended_upgrades.pp templates/Debian/preferences_jessie.erb templates/Debian/sources.list.erb
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/parser/functions/debian_nextcodename.rb13
-rw-r--r--lib/puppet/parser/functions/debian_nextrelease.rb11
-rw-r--r--lib/puppet/parser/functions/debian_release.rb12
-rw-r--r--lib/puppet/parser/functions/debian_release_version.rb11
4 files changed, 0 insertions, 47 deletions
diff --git a/lib/puppet/parser/functions/debian_nextcodename.rb b/lib/puppet/parser/functions/debian_nextcodename.rb
deleted file mode 100644
index 3d5c3bd..0000000
--- a/lib/puppet/parser/functions/debian_nextcodename.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-module Puppet::Parser::Functions
- newfunction(:debian_nextcodename, :type => :rvalue) do |args|
- case args[0]
- when "etch" then "lenny"
- when "lenny" then "squeeze"
- when "squeeze" then "wheezy"
- when "wheezy" then "jessie"
- when "jessie" then "sid"
- when "sid" then "experimental"
- else "sid"
- end
- end
-end
diff --git a/lib/puppet/parser/functions/debian_nextrelease.rb b/lib/puppet/parser/functions/debian_nextrelease.rb
deleted file mode 100644
index 76c3e0d..0000000
--- a/lib/puppet/parser/functions/debian_nextrelease.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module Puppet::Parser::Functions
- newfunction(:debian_nextrelease, :type => :rvalue) do |args|
- case args[0]
- when 'oldstable' then 'stable'
- when 'stable' then 'testing'
- when 'testing' then 'unstable'
- when 'unstable' then 'experimental'
- else 'unstable'
- end
- end
-end
diff --git a/lib/puppet/parser/functions/debian_release.rb b/lib/puppet/parser/functions/debian_release.rb
deleted file mode 100644
index d7b6718..0000000
--- a/lib/puppet/parser/functions/debian_release.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-module Puppet::Parser::Functions
- newfunction(:debian_release, :type => :rvalue) do |args|
- case args[0]
- when 'squeeze' then 'oldstable'
- when 'wheezy' then 'stable'
- when 'jessie' then 'testing'
- when 'sid' then 'unstable'
- when 'experimental' then 'experimental'
- else 'testing'
- end
- end
-end
diff --git a/lib/puppet/parser/functions/debian_release_version.rb b/lib/puppet/parser/functions/debian_release_version.rb
deleted file mode 100644
index 0abe90e..0000000
--- a/lib/puppet/parser/functions/debian_release_version.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module Puppet::Parser::Functions
- newfunction(:debian_release_version, :type => :rvalue) do |args|
- case args[0]
- when 'etch' then '4.0'
- when 'lenny' then '5.0'
- when 'squeeze' then '6.0'
- when 'wheezy' then '7.0'
- else ''
- end
- end
-end