diff options
author | Kai Knoblich <kai@FreeBSD.org> | 2020-11-20 08:57:10 +0000 |
---|---|---|
committer | Kai Knoblich <kai@FreeBSD.org> | 2020-11-20 08:57:10 +0000 |
commit | 1295cfab558bd8e2432f0122fa2a69bcafcf993d (patch) | |
tree | 1d02529db2d7e0ed0a614dc9d355d4c02a32c39c | |
parent | net-mgmt/py-napalm: Update to 3.2.0 (diff) |
net-mgmt/netbox: Update to 2.9.9
* Add to the EXAMPLES options a few example configurations and a sample
rc script to make use of the RQ background service.
Changelog:
Enhancements:
* Return server error messages as JSON when handling REST API requests
* Link to rack groups within rack list table
* Be more strict when capturing anticipated ImportError exceptions
Bug Fixes:
* Fix auto-population of region field when editing a device
* Fix config context rendering when multiple tags are assigned to an object
* Dry running scripts should not trigger webhooks
* Add missing template extension tags for plugins for VM interface view
* Fix CreatedUpdatedFilterTest when running in non-UTC timezone
* Fix filtering of sites by null region
https://github.com/netbox-community/netbox/releases/tag/v2.9.9
-rw-r--r-- | net-mgmt/netbox/Makefile | 8 | ||||
-rw-r--r-- | net-mgmt/netbox/distinfo | 6 | ||||
-rw-r--r-- | net-mgmt/netbox/files/netbox_rq.sample.in | 43 | ||||
-rw-r--r-- | net-mgmt/netbox/files/pkg-message.in | 10 | ||||
-rw-r--r-- | net-mgmt/netbox/pkg-plist | 4 |
5 files changed, 66 insertions, 5 deletions
diff --git a/net-mgmt/netbox/Makefile b/net-mgmt/netbox/Makefile index ca27f1910ec0..1c78d48d67dc 100644 --- a/net-mgmt/netbox/Makefile +++ b/net-mgmt/netbox/Makefile @@ -2,7 +2,7 @@ PORTNAME= netbox DISTVERSIONPREFIX= v -DISTVERSION= 2.9.8 +DISTVERSION= 2.9.9 CATEGORIES= net-mgmt MAINTAINER= kai@FreeBSD.org @@ -53,7 +53,7 @@ USES= pgsql:9.6+ python:3.6+ USE_GITHUB= yes GH_ACCOUNT= netbox-community -SUB_FILES= netboxrc.sample pkg-message +SUB_FILES= netbox_rq.sample netboxrc.sample pkg-message SUB_LIST= DATADIR=${DATADIR} PYTHON_CMD=${PYTHON_CMD} PYTHON_VER=${PYTHON_VER} WWWOWN=${WWWOWN} NO_BUILD= yes NO_ARCH= yes @@ -85,6 +85,10 @@ post-install-DOCS-on: post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKDIR}/netbox_rq.sample ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKDIR}/netboxrc.sample ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/contrib/apache.conf ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/contrib/gunicorn.py ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/contrib/nginx.conf ${STAGEDIR}${EXAMPLESDIR} .include <bsd.port.mk> diff --git a/net-mgmt/netbox/distinfo b/net-mgmt/netbox/distinfo index c4d621ee2510..95eb3f84ffa9 100644 --- a/net-mgmt/netbox/distinfo +++ b/net-mgmt/netbox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1604135336 -SHA256 (netbox-community-netbox-v2.9.8_GH0.tar.gz) = 182a773b604ef0e6f01cc42752799356431debd9b852f5b86ef19b2bd928271e -SIZE (netbox-community-netbox-v2.9.8_GH0.tar.gz) = 5799405 +TIMESTAMP = 1605642137 +SHA256 (netbox-community-netbox-v2.9.9_GH0.tar.gz) = 9d6252753754d7fa4a15920b810e4f615b63138b2572128fdbdb39ab054c7142 +SIZE (netbox-community-netbox-v2.9.9_GH0.tar.gz) = 5801532 diff --git a/net-mgmt/netbox/files/netbox_rq.sample.in b/net-mgmt/netbox/files/netbox_rq.sample.in new file mode 100644 index 000000000000..d2a6f98a65d9 --- /dev/null +++ b/net-mgmt/netbox/files/netbox_rq.sample.in @@ -0,0 +1,43 @@ +#!/bin/sh + +# This sample rc script starts the RQ worker background service which is +# required for Webhooks and various automation tasks. + +# +# PROVIDE: netbox_rq +# REQUIRE: DAEMON +# KEYWORD: shutdown +# +# Add the following line to /etc/rc.conf.local or /etc/rc.conf +# to enable netbox-rq: +# +# netbox_rq_enable (bool): Set to NO by default. +# Set it to YES to enable netbox_rq. + +. /etc/rc.subr + +name=netbox_rq +rcvar=netbox_rq_enable + +load_rc_config $name + +start_cmd="netbox_rq_start" +start_precmd="netbox_rq_precmd" +command="%%PYTHON_CMD%%" +command_args="%%DATADIR%%/manage.py rqworker" +pidfile=${netbox_rq_pidfile:-/var/run/${name}/${name}.pid} +netbox_rq_user=${netbox_rq_user:-www} + + +netbox_rq_precmd() +{ + install -d -o ${netbox_rq_user} `dirname ${pidfile}` +} + +netbox_rq_start() +{ + echo "Starting netbox_rq." + /usr/sbin/daemon -cf -p ${pidfile} -u ${netbox_rq_user} ${command} ${command_args} +} + +run_rc_command "$1" diff --git a/net-mgmt/netbox/files/pkg-message.in b/net-mgmt/netbox/files/pkg-message.in index 62295db75598..941578ac6e2f 100644 --- a/net-mgmt/netbox/files/pkg-message.in +++ b/net-mgmt/netbox/files/pkg-message.in @@ -249,4 +249,14 @@ rebuild the correct nested relationships after upgrading: >>> TenantGroup.objects.rebuild() EOD } +{ type: upgrade + maximum_version: 2.9.9 + message: <<EOD +An new sample rc script has been added to manage the RQ-worker service. If the +EXAMPLES option is enabled (which is the default) it can be found in the +following directory: + +%%EXAMPLESDIR%%/netbox_rq.sample +EOD +} ] diff --git a/net-mgmt/netbox/pkg-plist b/net-mgmt/netbox/pkg-plist index 5720317bbeac..890b8d0c823a 100644 --- a/net-mgmt/netbox/pkg-plist +++ b/net-mgmt/netbox/pkg-plist @@ -135,7 +135,11 @@ %%PORTDOCS%%%%DOCSDIR%%/rest-api/filtering.md %%PORTDOCS%%%%DOCSDIR%%/rest-api/overview.md %%PORTDOCS%%%%DOCSDIR%%/rest-api/working-with-secrets.md +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/apache.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gunicorn.py +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/netbox_rq.sample %%PORTEXAMPLES%%%%EXAMPLESDIR%%/netboxrc.sample +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nginx.conf %%DATADIR%%/circuits/__init__.py %%DATADIR%%/circuits/api/__init__.py %%DATADIR%%/circuits/api/nested_serializers.py |