mirror of
https://github.com/netbox-community/netbox.git
synced 2026-01-23 03:58:45 -06:00
Compare commits
2 Commits
32fb3869a4
...
7f2b744a53
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7f2b744a53 | ||
|
|
733dd81f0e |
@@ -72,6 +72,16 @@ Email is sent from NetBox only for critical events or if configured for [logging
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
## HOSTNAME
|
||||||
|
|
||||||
|
!!! info "This parameter was introduced in NetBox v4.4."
|
||||||
|
|
||||||
|
Default: System hostname
|
||||||
|
|
||||||
|
The hostname displayed in the user interface identifying the system on which NetBox is running. If not defined, this defaults to the system hostname as reported by Python's `platform.node()`.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## HTTP_PROXIES
|
## HTTP_PROXIES
|
||||||
|
|
||||||
Default: `None`
|
Default: `None`
|
||||||
|
|||||||
@@ -25,6 +25,9 @@ The user-defined functional [role](./role.md) assigned to the VLAN.
|
|||||||
|
|
||||||
### VLAN Group or Site
|
### VLAN Group or Site
|
||||||
|
|
||||||
|
!!! warning "Site assignment is deprecated"
|
||||||
|
The assignment of individual VLANs directly to a site has been deprecated. This ability will be removed in a future NetBox release. Users are strongly encouraged to utilize VLAN groups, which have the added benefit of supporting the assignment of a VLAN to multiple sites.
|
||||||
|
|
||||||
The [VLAN group](./vlangroup.md) or [site](../dcim/site.md) to which the VLAN is assigned.
|
The [VLAN group](./vlangroup.md) or [site](../dcim/site.md) to which the VLAN is assigned.
|
||||||
|
|
||||||
### Q-in-Q Role
|
### Q-in-Q Role
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ from utilities.forms.fields import (
|
|||||||
from utilities.forms.rendering import FieldSet, InlineFields, ObjectAttribute, TabbedGroups
|
from utilities.forms.rendering import FieldSet, InlineFields, ObjectAttribute, TabbedGroups
|
||||||
from utilities.forms.utils import get_field_value
|
from utilities.forms.utils import get_field_value
|
||||||
from utilities.forms.widgets import DatePicker, HTMXSelect
|
from utilities.forms.widgets import DatePicker, HTMXSelect
|
||||||
|
from django.utils.safestring import mark_safe
|
||||||
from utilities.templatetags.builtins.filters import bettertitle
|
from utilities.templatetags.builtins.filters import bettertitle
|
||||||
from virtualization.models import VMInterface
|
from virtualization.models import VMInterface
|
||||||
|
|
||||||
@@ -680,7 +681,15 @@ class VLANForm(TenancyForm, NetBoxModelForm):
|
|||||||
queryset=Site.objects.all(),
|
queryset=Site.objects.all(),
|
||||||
required=False,
|
required=False,
|
||||||
null_option='None',
|
null_option='None',
|
||||||
selector=True
|
selector=True,
|
||||||
|
help_text=mark_safe(
|
||||||
|
'<span class="text-warning"><i class="mdi mdi-alert"></i> {text}</span>'.format(
|
||||||
|
text=_(
|
||||||
|
'The direct assignment of VLANs to a site is deprecated and will be removed in a future release. '
|
||||||
|
'Users are encouraged to utilize VLAN groups for this purpose.'
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
role = DynamicModelChoiceField(
|
role = DynamicModelChoiceField(
|
||||||
label=_('Role'),
|
label=_('Role'),
|
||||||
|
|||||||
@@ -27,7 +27,6 @@ from utilities.string import trailing_slash
|
|||||||
|
|
||||||
RELEASE = load_release_data()
|
RELEASE = load_release_data()
|
||||||
VERSION = RELEASE.full_version # Retained for backward compatibility
|
VERSION = RELEASE.full_version # Retained for backward compatibility
|
||||||
HOSTNAME = platform.node()
|
|
||||||
# Set the base directory two levels up
|
# Set the base directory two levels up
|
||||||
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||||
|
|
||||||
@@ -125,6 +124,7 @@ EXEMPT_VIEW_PERMISSIONS = getattr(configuration, 'EXEMPT_VIEW_PERMISSIONS', [])
|
|||||||
FIELD_CHOICES = getattr(configuration, 'FIELD_CHOICES', {})
|
FIELD_CHOICES = getattr(configuration, 'FIELD_CHOICES', {})
|
||||||
FILE_UPLOAD_MAX_MEMORY_SIZE = getattr(configuration, 'FILE_UPLOAD_MAX_MEMORY_SIZE', 2621440)
|
FILE_UPLOAD_MAX_MEMORY_SIZE = getattr(configuration, 'FILE_UPLOAD_MAX_MEMORY_SIZE', 2621440)
|
||||||
GRAPHQL_MAX_ALIASES = getattr(configuration, 'GRAPHQL_MAX_ALIASES', 10)
|
GRAPHQL_MAX_ALIASES = getattr(configuration, 'GRAPHQL_MAX_ALIASES', 10)
|
||||||
|
HOSTNAME = getattr(configuration, 'HOSTNAME', platform.node())
|
||||||
HTTP_PROXIES = getattr(configuration, 'HTTP_PROXIES', {})
|
HTTP_PROXIES = getattr(configuration, 'HTTP_PROXIES', {})
|
||||||
INTERNAL_IPS = getattr(configuration, 'INTERNAL_IPS', ('127.0.0.1', '::1'))
|
INTERNAL_IPS = getattr(configuration, 'INTERNAL_IPS', ('127.0.0.1', '::1'))
|
||||||
ISOLATED_DEPLOYMENT = getattr(configuration, 'ISOLATED_DEPLOYMENT', False)
|
ISOLATED_DEPLOYMENT = getattr(configuration, 'ISOLATED_DEPLOYMENT', False)
|
||||||
|
|||||||
Reference in New Issue
Block a user