From c2cfa6929cc1561dfd8d63946ebb777ef9a94697 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Fri, 14 Dec 2018 19:32:52 +0100 Subject: [PATCH] TT#49102 Namespace binaries with ngcp- This makes it obvious these are NGCP specific programs, and avoids possible collisions with other third party programs. Create backward compatibility symlinks for a smoother transition. Change-Id: I7040725f16f835307b3ac8885186e7851e596c90 --- Makefile | 6 +++--- debian/ngcp-cdr-exporter.cron.d | 2 +- debian/ngcp-cdr-exporter.links | 3 +++ debian/ngcp-cdr-exporter.ngcp-event-exporter.cron.d | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 debian/ngcp-cdr-exporter.links diff --git a/Makefile b/Makefile index 10a1f54..53f87f6 100644 --- a/Makefile +++ b/Makefile @@ -7,9 +7,9 @@ all: install: $(INSTALL_DIR) $(DESTDIR)/usr/sbin - $(INSTALL_PROGRAM) cdr-md5.sh $(DESTDIR)/usr/sbin/cdr-md5 - $(INSTALL_PROGRAM) cdr-exporter.pl $(DESTDIR)/usr/sbin/cdr-exporter - $(INSTALL_PROGRAM) event-exporter.pl $(DESTDIR)/usr/sbin/event-exporter + $(INSTALL_PROGRAM) cdr-md5.sh $(DESTDIR)/usr/sbin/ngcp-cdr-md5 + $(INSTALL_PROGRAM) cdr-exporter.pl $(DESTDIR)/usr/sbin/ngcp-cdr-exporter + $(INSTALL_PROGRAM) event-exporter.pl $(DESTDIR)/usr/sbin/ngcp-event-exporter $(INSTALL_DIR) $(DESTDIR)/etc/ngcp-cdr-exporter $(INSTALL_DATA) cdr-exporter.conf $(DESTDIR)/etc/ngcp-cdr-exporter/cdr-exporter.conf $(INSTALL_DATA) event-exporter.conf $(DESTDIR)/etc/ngcp-cdr-exporter/event-exporter.conf diff --git a/debian/ngcp-cdr-exporter.cron.d b/debian/ngcp-cdr-exporter.cron.d index ba66829..8601698 100644 --- a/debian/ngcp-cdr-exporter.cron.d +++ b/debian/ngcp-cdr-exporter.cron.d @@ -1 +1 @@ -25,55 * * * * root . /etc/default/ngcp-roles; if /usr/sbin/ngcp-check-active -q && [ "$NGCP_IS_MGMT" = "yes" ] ; then /usr/sbin/cdr-exporter >/dev/null; fi +25,55 * * * * root . /etc/default/ngcp-roles; if /usr/sbin/ngcp-check-active -q && [ "$NGCP_IS_MGMT" = "yes" ] ; then /usr/sbin/ngcp-cdr-exporter >/dev/null; fi diff --git a/debian/ngcp-cdr-exporter.links b/debian/ngcp-cdr-exporter.links new file mode 100644 index 0000000..ff43644 --- /dev/null +++ b/debian/ngcp-cdr-exporter.links @@ -0,0 +1,3 @@ +usr/sbin/ngcp-cdr-exporter usr/sbin/cdr-exporter +usr/sbin/ngcp-cdr-md5 usr/sbin/cdr-md5 +usr/sbin/ngcp-event-exporter usr/sbin/event-exporter diff --git a/debian/ngcp-cdr-exporter.ngcp-event-exporter.cron.d b/debian/ngcp-cdr-exporter.ngcp-event-exporter.cron.d index bbfdf90..bb0f9d5 100644 --- a/debian/ngcp-cdr-exporter.ngcp-event-exporter.cron.d +++ b/debian/ngcp-cdr-exporter.ngcp-event-exporter.cron.d @@ -1 +1 @@ -0 0 * * * root . /etc/default/ngcp-roles; if /usr/sbin/ngcp-check-active -q && [ "$NGCP_IS_MGMT" = "yes" ] ; then /usr/sbin/event-exporter >/dev/null; fi +0 0 * * * root . /etc/default/ngcp-roles; if /usr/sbin/ngcp-check-active -q && [ "$NGCP_IS_MGMT" = "yes" ] ; then /usr/sbin/ngcp-event-exporter >/dev/null; fi