diff options
| -rw-r--r-- | Library/Formula/nagios-plugins.rb | 18 | ||||
| -rw-r--r-- | Library/Formula/nagios.rb | 5 | ||||
| -rw-r--r-- | Library/Formula/nrpe.rb | 8 |
3 files changed, 7 insertions, 24 deletions
diff --git a/Library/Formula/nagios-plugins.rb b/Library/Formula/nagios-plugins.rb index 197862176..722bcfafc 100644 --- a/Library/Formula/nagios-plugins.rb +++ b/Library/Formula/nagios-plugins.rb @@ -5,31 +5,19 @@ class NagiosPlugins < Formula homepage 'http://nagiosplugins.org/' md5 '56abd6ade8aa860b38c4ca4a6ac5ab0d' - def nagios_sbin; sbin+'nagios-plugins'; end - def install system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}", - "--libexecdir=#{nagios_sbin}" + "--libexecdir=#{sbin}" system "make install" system "make install-root" end def caveats <<-EOS.undent - All plugins are accessible under - - #{nagios_sbin} - - and get symlinked to - - #{HOMEBREW_PREFIX}/sbin/nagios-plugins - - so that they don't appear in your search path but still can be found by - nagios across version updates. - - Please feel free to update your PATH if you want to use them standalone! + All plugins have been installed in: + #{HOMEBREW_PREFIX}/sbin EOS end end diff --git a/Library/Formula/nagios.rb b/Library/Formula/nagios.rb index 558819984..e309e9eb5 100644 --- a/Library/Formula/nagios.rb +++ b/Library/Formula/nagios.rb @@ -24,6 +24,7 @@ class Nagios < Formula "--sysconfdir=#{nagios_etc}", "--localstatedir=#{nagios_var}", "--datadir=#{htdocs}", + "--libexecdir=#{HOMEBREW_PREFIX}/sbin", # Plugin dir "--with-cgiurl=/nagios/cgi-bin", "--with-htmurl=/nagios", "--with-nagios-user=#{user}", @@ -38,10 +39,6 @@ class Nagios < Formula system "make install-config" system "make install-webconf" (share+plist_path).write startup_plist - - # Symlink plugins - libexec.rmdir - ln_s HOMEBREW_PREFIX+'sbin/nagios-plugins', libexec end def startup_plist diff --git a/Library/Formula/nrpe.rb b/Library/Formula/nrpe.rb index 864d5e051..04a5dd7ec 100644 --- a/Library/Formula/nrpe.rb +++ b/Library/Formula/nrpe.rb @@ -7,8 +7,6 @@ class Nrpe < Formula depends_on 'nagios-plugins' - def plugins; HOMEBREW_PREFIX+'sbin/nagios-plugins'; end - def install user = `id -un`.chomp group = `id -gn`.chomp @@ -18,7 +16,7 @@ class Nrpe < Formula system "./configure", "--disable-debug", "--disable-dependency-tracking", "--prefix=#{prefix}", - "--libexecdir=#{plugins}", + "--libexecdir=#{sbin}", "--with-nrpe-user=#{user}", "--with-nrpe-group=#{group}", "--with-nagios-user=#{user}", @@ -33,8 +31,8 @@ class Nrpe < Formula def caveats <<-EOS.undent - The nagios plugin check_nrpe has been installed to: - #{plugins} + The nagios plugin check_nrpe has been installed in: + #{HOMEBREW_PREFIX}/sbin You can start the daemon with #{bin}/nrpe -c #{etc}/nrpe.cfg -d |