librenms tweak: use sed instead of patching to replace username in

sample crontab entries, drop some other minor changes that are no longer
needed/wanted.
This commit is contained in:
sthen 2017-12-13 16:25:15 +00:00
parent 4654b6d668
commit a3fc5ad9b6
2 changed files with 3 additions and 26 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.55 2017/12/13 15:56:07 sthen Exp $
# $OpenBSD: Makefile,v 1.56 2017/12/13 16:25:15 sthen Exp $
COMMENT = auto-discovering network management/monitoring system
@ -6,7 +6,7 @@ GH_ACCOUNT = librenms
GH_PROJECT = librenms
GH_TAGNAME = 1.34
EPOCH = 0
REVISION = 1
REVISION = 2
CATEGORIES = net www
@ -53,6 +53,7 @@ R += s,/usr/local,${LOCALBASE},g
post-extract:
find ${WRKSRC} -type f -print0 | xargs -r0 perl -pi -e '$R'
sed -i 's, librenms , _librenms ,' ${WRKSRC}/librenms.nonroot.cron
do-install:
${INSTALL_DATA_DIR} ${INSTDIR}

View File

@ -1,24 +0,0 @@
$OpenBSD: patch-librenms_nonroot_cron,v 1.8 2017/11/27 17:41:36 sthen Exp $
Index: librenms.nonroot.cron
--- librenms.nonroot.cron.orig
+++ librenms.nonroot.cron
@@ -1,10 +1,10 @@
# Using this cron file requires an additional user on your system, please see install docs.
-33 */6 * * * librenms /var/www/librenms/cronic /var/www/librenms/discovery-wrapper.py 1
-*/5 * * * * librenms /var/www/librenms/discovery.php -h new >> /dev/null 2>&1
-*/5 * * * * librenms /var/www/librenms/cronic /var/www/librenms/poller-wrapper.py 16
-15 0 * * * librenms /var/www/librenms/daily.sh >> /dev/null 2>&1
-* * * * * librenms /var/www/librenms/alerts.php >> /dev/null 2>&1
-*/5 * * * * librenms /var/www/librenms/poll-billing.php >> /dev/null 2>&1
-01 * * * * librenms /var/www/librenms/billing-calculate.php >> /dev/null 2>&1
-*/5 * * * * librenms /var/www/librenms/check-services.php >> /dev/null 2>&1
+33 */6 * * * _librenms /var/www/librenms/discovery-wrapper.py 1
+*/5 * * * * _librenms /var/www/librenms/discovery.php -h new >> /dev/null 2>&1
+*/5 * * * * _librenms /var/www/librenms/poller-wrapper.py 16
+15 0 * * * _librenms sh /var/www/librenms/daily.sh >> /dev/null 2>&1
+* * * * * _librenms /var/www/librenms/alerts.php >> /dev/null 2>&1
+*/5 * * * * _librenms /var/www/librenms/poll-billing.php >> /dev/null 2>&1
+01 * * * * _librenms /var/www/librenms/billing-calculate.php >> /dev/null 2>&1
+*/5 * * * * _librenms /var/www/librenms/check-services.php >> /dev/null 2>&1