Date: Fri, 3 Apr 2020 18:46:25 +0000 (UTC) From: Kai Knoblich <kai@FreeBSD.org> 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 Message-ID: <202004031846.033IkPk6076457@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <ohartmann@walstatt.org> [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: <<EOD +The "webhooks" REDIS configuration section has been renamed to "tasks". Please +update your configuration as support for the old name will be removed in a +future release. + +Also the sample rc script got some new default values and improvements, e.g. +the possibility to add extra arguments or to use a configuration file instead +of using rc variables. +EOD +} ] Modified: head/net-mgmt/netbox/pkg-plist ============================================================================== --- head/net-mgmt/netbox/pkg-plist Fri Apr 3 18:37:32 2020 (r530514) +++ head/net-mgmt/netbox/pkg-plist Fri Apr 3 18:46:25 2020 (r530515) @@ -38,6 +38,7 @@ %%PORTDOCS%%%%DOCSDIR%%/development/squashing-migrations.md %%PORTDOCS%%%%DOCSDIR%%/development/style-guide.md %%PORTDOCS%%%%DOCSDIR%%/development/utility-views.md +%%PORTDOCS%%%%DOCSDIR%%/extra.css %%PORTDOCS%%%%DOCSDIR%%/index.md %%PORTDOCS%%%%DOCSDIR%%/installation/1-postgresql.md %%PORTDOCS%%%%DOCSDIR%%/installation/2-redis.md @@ -314,6 +315,7 @@ %%DATADIR%%/extras/management/commands/__init__.py %%DATADIR%%/extras/management/commands/nbshell.py %%DATADIR%%/extras/management/commands/renaturalize.py +%%DATADIR%%/extras/management/commands/rqworker.py %%DATADIR%%/extras/management/commands/runreport.py %%DATADIR%%/extras/middleware.py %%DATADIR%%/extras/migrations/0001_initial.py @@ -358,9 +360,11 @@ %%DATADIR%%/extras/migrations/0036_contenttype_filters_to_q_objects.py %%DATADIR%%/extras/migrations/0037_configcontexts_clusters.py %%DATADIR%%/extras/migrations/0038_webhook_template_support.py +%%DATADIR%%/extras/migrations/0039_update_features_content_types.py %%DATADIR%%/extras/migrations/__init__.py %%DATADIR%%/extras/models.py %%DATADIR%%/extras/querysets.py +%%DATADIR%%/extras/registry.py %%DATADIR%%/extras/reports.py %%DATADIR%%/extras/scripts.py %%DATADIR%%/extras/signals.py @@ -374,6 +378,7 @@ %%DATADIR%%/extras/tests/test_customfields.py %%DATADIR%%/extras/tests/test_filters.py %%DATADIR%%/extras/tests/test_models.py +%%DATADIR%%/extras/tests/test_registry.py %%DATADIR%%/extras/tests/test_scripts.py %%DATADIR%%/extras/tests/test_tags.py %%DATADIR%%/extras/tests/test_views.py @@ -459,9 +464,11 @@ %%DATADIR%%/netbox/api.py %%DATADIR%%/netbox/configuration.example.py %%DATADIR%%/netbox/forms.py +%%DATADIR%%/netbox/releases.py %%DATADIR%%/netbox/settings.py %%DATADIR%%/netbox/tests/__init__.py %%DATADIR%%/netbox/tests/test_api.py +%%DATADIR%%/netbox/tests/test_releases.py %%DATADIR%%/netbox/tests/test_views.py %%DATADIR%%/netbox/urls.py %%DATADIR%%/netbox/views.py @@ -1296,6 +1303,7 @@ %%DATADIR%%/templates/404.html %%DATADIR%%/templates/500.html %%DATADIR%%/templates/_base.html +%%DATADIR%%/templates/admin/index.html %%DATADIR%%/templates/circuits/circuit.html %%DATADIR%%/templates/circuits/circuit_edit.html %%DATADIR%%/templates/circuits/circuit_terminations_swap.html @@ -1363,6 +1371,8 @@ %%DATADIR%%/templates/dcim/rack.html %%DATADIR%%/templates/dcim/rack_edit.html %%DATADIR%%/templates/dcim/rack_elevation_list.html +%%DATADIR%%/templates/dcim/rackreservation.html +%%DATADIR%%/templates/dcim/rackreservation_edit.html %%DATADIR%%/templates/dcim/site.html %%DATADIR%%/templates/dcim/site_edit.html %%DATADIR%%/templates/dcim/virtualchassis_add_member.html @@ -1513,6 +1523,7 @@ %%DATADIR%%/utilities/__init__.py %%DATADIR%%/utilities/api.py %%DATADIR%%/utilities/auth_backends.py +%%DATADIR%%/utilities/background_tasks.py %%DATADIR%%/utilities/choices.py %%DATADIR%%/utilities/constants.py %%DATADIR%%/utilities/context_processors.py
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004031846.033IkPk6076457>