2 files changed, 0 insertions, 77 deletions
diff --git a/lib/facter/couchdb_pwhash_alg.rb b/lib/facter/couchdb_pwhash_alg.rb
deleted file mode 100644
index 60ae701a..00000000
--- a/lib/facter/couchdb_pwhash_alg.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-require 'facter'
-
-def version_parts ( version )
-  # gives back a hash containing major, minor and patch numbers
-  # of a give version string
-
-  parts = Hash.new
-  first, *rest = version.split(".")
-  parts["major"] = first
-  parts["minor"] = rest[0]
-  parts["patch"] = rest[1]
-  return parts
-end
-
-def couchdb_pwhash_alg
-  # couchdb uses sha1 as pw hash algorithm until v. 1.2,
-  # but pbkdf2 from v.1.3 on.
-  # see http://docs.couchdb.org/en/1.4.x/configuring.html for
-  # details
-
-  couchdb_version = Facter.value(:couchdb_version)
-  version = version_parts(couchdb_version)
-  major = version["major"].to_i
-  alg = case major
-    when 0 then alg = 'n/a'
-    when 1 then
-      minor = version['minor'].to_i
-      if minor < 3
-        alg = 'sha1'
-      else
-        alg = 'pbkdf2'
-      end
-  else
-    alg = 'pbkdf2'
-  end
-  return alg
-end
-
-Facter.add(:couchdb_pwhash_alg) do
-  setcode do
-    couchdb_pwhash_alg
-  end
-end
diff --git a/lib/facter/couchdb_version.rb b/lib/facter/couchdb_version.rb
deleted file mode 100644
index 3a721169..00000000
--- a/lib/facter/couchdb_version.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require 'facter'
-
-def deb_installed_version ( name )
-  # returns an empty string if package is not installed,
-  # otherwise the version
-
-  version = `apt-cache policy #{name} | grep Installed 2>&1`
-  version.slice! "  Installed: "
-  version.slice! "(none)"
-  return version.strip.chomp
-end
-
-def couchdb_version
-  bigcouch = deb_installed_version("bigcouch")
-  if bigcouch.empty?
-    couchdb = deb_installed_version("couchdb")
-    if couchdb.empty?
-      version = 'n/a'
-    else
-      version =  couchdb
-    end
-  else
-    # bigcouch is currently only available in one version (0.4.2),
-    # which includes couchdb 1.1.1
-    version = '1.1.1'
-  end
-  return version
-end
-
-Facter.add(:couchdb_version) do
-  setcode do
-    couchdb_version
-  end
-end