Skip to content

Commit

Permalink
Remove Nagios plugin
Browse files Browse the repository at this point in the history
The Nagios plugin now lives in a separate repo:

    https://github.com/latchset/nagios-tang/
  • Loading branch information
npmccallum committed Aug 10, 2018
1 parent 8eeac73 commit e723fd5
Showing 6 changed files with 1 addition and 667 deletions.
16 changes: 1 addition & 15 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -7,7 +7,6 @@ man8_MANS=
AM_CFLAGS = @TANG_CFLAGS@ @jose_CFLAGS@
LDADD = @jose_LIBS@ @http_parser_LIBS@

nagiosdir = $(libdir)/nagios/plugins
cachedir = $(localstatedir)/cache/$(PACKAGE_NAME)
jwkdir = $(localstatedir)/db/$(PACKAGE_NAME)

@@ -21,10 +20,8 @@ nodist_systemdsystemunit_DATA = \
dist_libexec_SCRIPTS = src/tangd-update src/tangd-keygen
dist_bin_SCRIPTS = src/tang-show-keys
libexec_PROGRAMS = src/tangd
nagios_PROGRAMS = src/tang

man_ADOC_FILES= \
doc/tang-nagios.1.adoc \
doc/tang-show-keys.1.adoc \
doc/tang.8.adoc

@@ -35,21 +32,13 @@ CLEANFILES += $(man_ROFF_FILES) $(man_ROFF_FILES:.roff=)

$(top_builddir)/%.roff: %.adoc
$(MKDIR_P) $$(dirname $@)
$(A2X) -v -f manpage $^ -D $(top_builddir)/$$(dirname $@)
$(A2X) -f manpage $^ -D $(top_builddir)/$$(dirname $@)
$(INSTALL) -m 644 $(top_builddir)/$(@:.roff=) $(top_builddir)/$@

man1_MANS += doc/tang-show-keys.1
man8_MANS += doc/tang.8
endif

if NAGIOSPLUGIN
nagios_PROGRAMS = src/tang
if HAVE_A2X
man1_MANS += doc/tang-nagios.1
endif
src_tang_SOURCES = src/nagios.c
endif

src_tangd_SOURCES = src/http.c src/http.h src/tangd.c

%: %.in
@@ -62,9 +51,6 @@ src_tangd_SOURCES = src/http.c src/http.h src/tangd.c

AM_TESTS_ENVIRONMENT = SD_ACTIVATE="@SD_ACTIVATE@" PATH=$(srcdir)/src:$(builddir)/src:$(PATH)
TESTS = tests/adv tests/rec
if NAGIOSPLUGIN
TESTS += tests/nagios
endif

CLEANFILES += $(nodist_systemdsystemunit_DATA)
EXTRA_DIST = \
4 changes: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -70,10 +70,6 @@ additional settings (such as SETGID directories) out of the box. To install it:

$ sudo dnf install tang

Fedora also packages the nagios plugin for monitoring the Tang server:

$ sudo dnf install tang-nagios

If you really want to build from source on Fedora, you will need the following
packages:

5 changes: 0 additions & 5 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -29,11 +29,6 @@ AC_CHECK_LIB([http_parser], [http_parser_execute],
PKG_CHECK_MODULES([jose], [jose >= 8])
PKG_CHECK_MODULES([systemd], [systemd])

AC_ARG_ENABLE([nagiosplugin],
AS_HELP_STRING([--disable-nagiosplugin], [Disable Nagios plugin]))

AM_CONDITIONAL([NAGIOSPLUGIN], [test "x$enable_nagiosplugin" != "xno"])

AC_ARG_WITH([systemdsystemunitdir],
[AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],
[],
48 changes: 0 additions & 48 deletions doc/tang-nagios.1.adoc

This file was deleted.

Loading

0 comments on commit e723fd5

Please sign in to comment.