Date: Wed, 14 Jan 2026 17:29:03 +0000 From: Dan Langille <dvl@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 3a45cbda9c3b - main - net-mgmt/librenms: start service in WWWDIR Message-ID: <6967d25f.34c80.7a4c31e7@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by dvl: URL: https://cgit.FreeBSD.org/ports/commit/?id=3a45cbda9c3b9cfa8f1893b42108961793e86e30 commit 3a45cbda9c3b9cfa8f1893b42108961793e86e30 Author: Dan Langille <dvl@FreeBSD.org> AuthorDate: 2026-01-14 17:26:52 +0000 Commit: Dan Langille <dvl@FreeBSD.org> CommitDate: 2026-01-14 17:28:48 +0000 net-mgmt/librenms: start service in WWWDIR The latest release uses relative paths for some includes Our default path is / That craps out the code like this: Error Failed opening required 'includes/discovery/sensors/cisco-entity-sensor.inc.php' re: https://github.com/librenms/librenms/issues/18794 PR: https://github.com/librenms/librenms/issues/18794 --- net-mgmt/librenms/Makefile | 32 ++++++++++++++++---------------- net-mgmt/librenms/files/librenms.in | 2 ++ 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/net-mgmt/librenms/Makefile b/net-mgmt/librenms/Makefile index 6645d55949bc..b261884bef95 100644 --- a/net-mgmt/librenms/Makefile +++ b/net-mgmt/librenms/Makefile @@ -1,5 +1,6 @@ PORTNAME= librenms PORTVERSION= 26.1.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= LOCAL/dvl:vendor @@ -47,12 +48,12 @@ SHEBANG_FILES= ../${PORTNAME}-vendor-${PORTVERSION}/paragonie/random_compat/buil ../librenms-vendor-${PORTVERSION}/symfony/yaml/Resources/bin/yaml-lint \ alerts.php artisan billing-calculate.php check-services.php \ config_to_json.php cronic daily.php daily.sh delhost.php \ - discovery-wrapper.py discovery.php irc.php \ - librenms-service.py LibreNMS/command_runner.py \ - LibreNMS/wrapper.py lnms misc/lnms-completion.bash \ - misc/smokeping-debian.example misc/smokeping-rhel.example \ - ping.php poll-billing.php poller-wrapper.py poller.php \ - renamehost.php scripts/auth_test.php scripts/bash_lint.sh \ + discovery-wrapper.py discovery.php irc.php librenms-service.py \ + LibreNMS/command_runner.py LibreNMS/wrapper.py lnms \ + misc/lnms-completion.bash misc/smokeping-debian.example \ + misc/smokeping-rhel.example ping.php poll-billing.php \ + poller-wrapper.py poller.php renamehost.php \ + scripts/auth_test.php scripts/bash_lint.sh \ scripts/check_requirements.py scripts/collect-port-polling.php \ scripts/collect-snmp-data.php scripts/composer_wrapper.php \ scripts/dynamic_check_requirements.py scripts/gen_rancid.php \ @@ -67,11 +68,10 @@ SHEBANG_FILES= ../${PORTNAME}-vendor-${PORTVERSION}/paragonie/random_compat/buil scripts/Migration/XML_Conversion/mkdir.sh scripts/new-os.php \ scripts/pre-commit.php scripts/purge-port.php \ scripts/removespikes.php scripts/removespikes.pl \ - scripts/rename-mibs.php \ - scripts/save-test-data.php scripts/syslog-notify-oxidized.php \ - scripts/test-alert.php scripts/test-template.php \ - scripts/watchmaillog/watchmaillog.pl snmp-scan.py snmptrap.php \ - syslog.php validate.php + scripts/rename-mibs.php scripts/save-test-data.php \ + scripts/syslog-notify-oxidized.php scripts/test-alert.php \ + scripts/test-template.php scripts/watchmaillog/watchmaillog.pl \ + snmp-scan.py snmptrap.php syslog.php validate.php NO_ARCH= yes NO_BUILD= yes @@ -115,11 +115,11 @@ X11_USES_OFF= magick:6,nox11 _ROOT_FILES= alerts.php artisan billing-calculate.php \ check-services.php composer.json composer.lock \ config.php.default config_to_json.php cronic daily.php \ - delhost.php discovery-wrapper.py discovery.php \ - irc.php librenms-service.py mkdocs.yml \ - phpunit.xml ping.php poll-billing.php poller.php \ - poller-wrapper.py renamehost.php snmp-scan.py \ - snmptrap.php syslog.php validate.php + delhost.php discovery-wrapper.py discovery.php irc.php \ + librenms-service.py mkdocs.yml phpunit.xml ping.php \ + poll-billing.php poller.php poller-wrapper.py \ + renamehost.php snmp-scan.py snmptrap.php syslog.php \ + validate.php _SCRIPT_FILES= daily.sh lnms # _RELEASE_TIMESTAMP is used for a patch inside the vendor code # it represents the release date via: git show --pretty='%H|%ct' -s 1.42.01 diff --git a/net-mgmt/librenms/files/librenms.in b/net-mgmt/librenms/files/librenms.in index f0edd60d65c0..7746f15ce9b8 100644 --- a/net-mgmt/librenms/files/librenms.in +++ b/net-mgmt/librenms/files/librenms.in @@ -43,6 +43,8 @@ librenms_precmd() { [ -f /var/log/$name/$name-service.log ] || install -g $librenms_group -o $librenms_user -m 644 /dev/null /var/log/$name/$name-service.log [ -f /var/log/$name/$name.log ] || install -g $librenms_group -o $librenms_user -m 644 /dev/null /var/log/$name/$name.log + # Make sure the service runs out of %%WWWDIR%% in order to find all the includes. + cd %%WWWDIR%% } command_args="$librenms_daemonflags -p $pidfile $procname %%WWWDIR%%/librenms-service.py"home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6967d25f.34c80.7a4c31e7>