patch-Rakefile 1.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051
  1. $OpenBSD: patch-Rakefile,v 1.7 2014/07/09 08:31:51 jasper Exp $
  2. - Change various configuration variables to what they would be like when
  3. PuppetDB has been _installed_, as these variables are used in other scripts.
  4. The installer has been modified in tasks/install.rake
  5. - Set OpenBSD's Ruby site dir.
  6. --- Rakefile.orig Mon Jul 7 19:37:05 2014
  7. +++ Rakefile Wed Jul 9 10:20:57 2014
  8. @@ -85,24 +85,24 @@ else
  9. else
  10. "/usr/share/puppetdb"
  11. end
  12. - @etc_dir = "/etc/puppetdb"
  13. - @config_dir = "/etc/puppetdb/conf.d"
  14. - @lib_dir = "/var/lib/puppetdb"
  15. + @etc_dir = "${SYSCONFDIR}/puppetdb"
  16. + @config_dir = "${SYSCONFDIR}/puppetdb/conf.d"
  17. + @lib_dir = "${VARBASE}/db//puppetdb"
  18. @libexec_dir = case @osfamily
  19. when /openbsd/
  20. - "/usr/local/libexec/puppetdb"
  21. + "${PREFIX}/libexec/puppetdb"
  22. when /redhat/, /suse/, /darwin/, /bsd/
  23. "/usr/libexec/puppetdb"
  24. else
  25. "/usr/lib/puppetdb"
  26. end
  27. - @link = "/usr/share/puppetdb"
  28. - @name = "puppetdb"
  29. + @link = "share/puppetdb"
  30. + @name = "_puppetdb"
  31. @sbin_dir = case @osfamily
  32. when /archlinux/
  33. "/usr/bin"
  34. else
  35. - "/usr/sbin"
  36. + "sbin"
  37. end
  38. end
  39. @@ -128,7 +128,7 @@ case @osfamily
  40. when /suse/
  41. @plibdir = @pe ? PE_SITELIBDIR : (%x(ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']").chomp)
  42. when /openbsd/
  43. - @plibdir = @pe ? PE_SITELIBDIR : '/usr/local/lib/ruby/site_ruby/1.9.1'
  44. + @plibdir = @pe ? PE_SITELIBDIR : '${MODRUBY_SITEDIR}'
  45. when /archlinux/
  46. @plibdir = @pe ? PE_SITELIBDIR : (%x(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorlibdir"]').chomp)
  47. end