From owner-svn-ports-head@freebsd.org Fri Apr 3 18:56:01 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6384C264C93; Fri, 3 Apr 2020 18:56:01 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48v8KC3RRwz48b9; Fri, 3 Apr 2020 18:55:59 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AB9539AD1; Fri, 3 Apr 2020 18:46:26 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 033IkQAl076462; Fri, 3 Apr 2020 18:46:26 GMT (envelope-from kai@FreeBSD.org) Received: (from kai@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 033IkPk6076457; Fri, 3 Apr 2020 18:46:25 GMT (envelope-from kai@FreeBSD.org) Message-Id: <202004031846.033IkPk6076457@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kai set sender to kai@FreeBSD.org using -f From: Kai Knoblich Date: Fri, 3 Apr 2020 18:46:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r530515 - in head/net-mgmt/netbox: . files X-SVN-Group: ports-head X-SVN-Commit-Author: kai X-SVN-Commit-Paths: in head/net-mgmt/netbox: . files X-SVN-Commit-Revision: 530515 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Apr 2020 18:56:01 -0000 Author: kai Date: Fri Apr 3 18:46:25 2020 New Revision: 530515 URL: https://svnweb.freebsd.org/changeset/ports/530515 Log: net-mgmt/netbox: Update to 2.7.11 * Improve the sample rc script to allow passing of extra arguments, e.g. to listen on multiple interfaces/addresses [1] or use a configuration file instead using rc variables. Kudos to Thomas Kurschel for some extra testing of the updated rc script. Changelog: Enhancements: * Add ability to automatically check for new releases (must be enabled by setting RELEASE_CHECK_URL) * Custom script object variables now utilize dynamic form widgets * Add descriptive tooltip to custom fields on object views * Add a dedicated view for rack reservations * Enable webhooks for rack reservations * Enable export templates for rack reservations * Enable custom links for rack reservations * Update admin links for Django RQ to reflect multiple queues * Add a bulk edit view for device bays * Add cable trace button for circuit terminations Bug Fixes: * Improve prefix_length validation on available-prefixes API * Fix cable tracing across multiple rear ports * Enforce unique constraints for device and virtual machine names in the API * Fix Markdown support for tables * Fix exception raised on IP address bulk add view * Fix duplicate name validation on device model https://github.com/netbox-community/netbox/releases/tag/v2.7.11 PR: 244629 [1] Reported by: O. Hartmann [1] MFH: 2020Q2 Modified: head/net-mgmt/netbox/Makefile head/net-mgmt/netbox/distinfo head/net-mgmt/netbox/files/netboxrc.sample.in head/net-mgmt/netbox/files/pkg-message.in head/net-mgmt/netbox/pkg-plist Modified: head/net-mgmt/netbox/Makefile ============================================================================== --- head/net-mgmt/netbox/Makefile Fri Apr 3 18:37:32 2020 (r530514) +++ head/net-mgmt/netbox/Makefile Fri Apr 3 18:46:25 2020 (r530515) @@ -2,7 +2,7 @@ PORTNAME= netbox DISTVERSIONPREFIX= v -DISTVERSION= 2.7.10 +DISTVERSION= 2.7.11 CATEGORIES= net-mgmt MAINTAINER= kai@FreeBSD.org Modified: head/net-mgmt/netbox/distinfo ============================================================================== --- head/net-mgmt/netbox/distinfo Fri Apr 3 18:37:32 2020 (r530514) +++ head/net-mgmt/netbox/distinfo Fri Apr 3 18:46:25 2020 (r530515) @@ -1,3 +1,3 @@ -TIMESTAMP = 1584023099 -SHA256 (netbox-community-netbox-v2.7.10_GH0.tar.gz) = 21743eda8f633761fd9a16c28658235e7ee9a79b15353770b4b1fe0d133a26e5 -SIZE (netbox-community-netbox-v2.7.10_GH0.tar.gz) = 5589759 +TIMESTAMP = 1585496811 +SHA256 (netbox-community-netbox-v2.7.11_GH0.tar.gz) = a910d6d32dd8912718cba228a7bbc1ef7d0ab3a6397a5a6a8089ab86603ed260 +SIZE (netbox-community-netbox-v2.7.11_GH0.tar.gz) = 5597953 Modified: head/net-mgmt/netbox/files/netboxrc.sample.in ============================================================================== --- head/net-mgmt/netbox/files/netboxrc.sample.in Fri Apr 3 18:37:32 2020 (r530514) +++ head/net-mgmt/netbox/files/netboxrc.sample.in Fri Apr 3 18:46:25 2020 (r530515) @@ -14,18 +14,29 @@ # Add the following line to /etc/rc.conf.local or /etc/rc.conf # to enable netbox: # -# netbox_enable (bool): Set to NO by default. -# Set it to YES to enable netbox. -# netbox_config (str): Default to "/usr/local/etc/${name}.conf}" -# Config file for gunicorn's netbox config file -# netbox_command (str): Default to "/usr/local/bin/gunicorn-3.6" -# Path to gunicorn to run netbox -# netbox_bind (str): Default to "localhost:8001" -# Interface and port to bind to -# netbox_workers (int): Default to "3" -# Number of gunicorn works -# netbox_timeout (int): Default to "120" -# Worker timeout for gunicorn +# netbox_enable (bool): Set to NO by default. +# Set it to YES to enable netbox. +# netbox_use_config (bool): Set to NO by default. +# If set, read the configuration parameter from file defined in +# "netbox_config" instead using rc variables. +# netbox_config (str): Default to "/usr/local/etc/${name}.conf}" +# Config file for gunicorn's netbox config file +# netbox_command (str): Default to "%%LOCALBASE%%/bin/gunicorn" +# Path to gunicorn to run netbox +# netbox_bind (str): Default to "localhost:8001" +# Interface and port to bind to +# netbox_workers (int): Default to "5" +# Number of gunicorn workers +# netbox_threads (int): Default to "3" +# Number of worker threads per handling request +# netbox_timeout (int): Default to "120" +# Worker timeout for gunicorn +# netbox_max_requests (int): Default to "5000" +# Maximum number of requests a worker process will process before respawning +# netbox_max_requests_jitter (int): Default to "500" +# Maximum number jitter to add to "netbox_max_requests" +# netbox_extra_args (str): Not set by default +# Extra arguments that are passed to gunicorn # . /etc/rc.subr @@ -42,17 +53,35 @@ procname=${netbox_procname:-%%PYTHON_CMD%%} netbox_chdir=${netbox_path} pidfile=${netbox_pidfile:-/var/run/${name}/${name}.pid} netbox_user=${netbox_user:-%%WWWOWN%%} +netbox_use_config=${netbox_use_config:-no} +netbox_config=${netbox_config:-/${name}.conf} netbox_bind=${netbox_bind:-localhost:8001} -netbox_workers=${netbox_workers:-3} +netbox_workers=${netbox_workers:-5} +netbox_threads=${netbox_threads:-3} netbox_timeout=${netbox_timeout:-120} +netbox_max_requests=${netbox_max_requests:-5000} +netbox_max_requests_jitter=${netbox_max_requests_jitter:-500} -command_args="${netbox_args} -D \ - --log-syslog --log-syslog-prefix ${name} \ - --log-syslog-to unix:///var/run/log#dgram \ - --disable-redirect-access-to-syslog \ - -p ${pidfile} --pythonpath ${netbox_path} \ - -b ${netbox_bind} -w ${netbox_workers} -t ${netbox_timeout} \ - netbox.wsgi" +# Read settings from confguration file if set +if checkyesno netbox_use_config && [ -f "${netbox_config}" ]; then + command_args="${netbox_args} -D \ + --log-syslog --log-syslog-prefix ${name} \ + --log-syslog-to unix:///var/run/log#dgram \ + --disable-redirect-access-to-syslog \ + -p ${pidfile} --pythonpath ${netbox_path} \ + -c ${netbox_config} \ + netbox.wsgi" +else + command_args="${netbox_args} -D \ + --log-syslog --log-syslog-prefix ${name} \ + --log-syslog-to unix:///var/run/log#dgram \ + --disable-redirect-access-to-syslog \ + -p ${pidfile} --pythonpath ${netbox_path} \ + -b ${netbox_bind} -w ${netbox_workers} --threads ${netbox_threads} -t ${netbox_timeout} \ + --max-requests ${netbox_max_requests} --max-requests-jitter ${netbox_max_requests_jitter} \ + ${netbox_extra_args} \ + netbox.wsgi" +fi netbox_precmd() { Modified: head/net-mgmt/netbox/files/pkg-message.in ============================================================================== --- head/net-mgmt/netbox/files/pkg-message.in Fri Apr 3 18:37:32 2020 (r530514) +++ head/net-mgmt/netbox/files/pkg-message.in Fri Apr 3 18:46:25 2020 (r530515) @@ -181,4 +181,16 @@ That step was added to the existing update instruction with each update. EOD } +{ type: upgrade + maximum_version: 2.7.11 + message: <