Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 0 additions & 26 deletions .pylintrc

This file was deleted.

8 changes: 4 additions & 4 deletions development/base_configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,19 @@
"PORT": int(os.environ.get("REDIS_PORT", 6379)),
"PASSWORD": os.environ.get("REDIS_PASSWORD", ""),
"DATABASE": 1,
"DEFAULT_TIMEOUT": 300,
"SSL": bool(os.environ.get("REDIS_SSL", False)),
},
"tasks": {
"HOST": os.environ.get("REDIS_HOST", "redis"),
"PORT": int(os.environ.get("REDIS_PORT", 6379)),
"PASSWORD": os.environ.get("REDIS_PASSWORD", ""),
"DATABASE": 0,
"DEFAULT_TIMEOUT": 300,
"SSL": bool(os.environ.get("REDIS_SSL", False)),
},
}

RQ_DEFAULT_TIMEOUT = 300


#########################
# #
Expand Down Expand Up @@ -179,11 +179,11 @@

# Remote authentication support
REMOTE_AUTH_ENABLED = False
REMOTE_AUTH_BACKEND = "utilities.auth_backends.RemoteUserBackend"
REMOTE_AUTH_BACKEND = "netbox.authentication.RemoteUserBackend"
REMOTE_AUTH_HEADER = "HTTP_REMOTE_USER"
REMOTE_AUTH_AUTO_CREATE_USER = True
REMOTE_AUTH_DEFAULT_GROUPS = []
REMOTE_AUTH_DEFAULT_PERMISSIONS = []
REMOTE_AUTH_DEFAULT_PERMISSIONS = {}

# This determines how often the GitHub API is called to check the latest release of NetBox. Must be at least 1 hour.
RELEASE_CHECK_TIMEOUT = 24 * 3600
Expand Down
4 changes: 4 additions & 0 deletions development/netbox_v2.8.3/configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,7 @@
from .base_configuration import * # pylint: disable=relative-beyond-top-level, wildcard-import

# Overrides specific to this version go here
REMOTE_AUTH_BACKEND = "utilities.auth_backends.RemoteUserBackend"
REMOTE_AUTH_DEFAULT_PERMISSIONS = []
REDIS["caching"]["DEFAULT_TIMEOUT"] = 300 # pylint: disable=undefined-variable
REDIS["tasks"]["DEFAULT_TIMEOUT"] = 300 # pylint: disable=undefined-variable
2 changes: 1 addition & 1 deletion netbox_onboarding/tests/test_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
See the License for the specific language governing permissions and
limitations under the License.
"""
from django.contrib.auth.models import User
from django.contrib.auth.models import User # pylint: disable=imported-auth-user
from django.test import TestCase
from django.urls import reverse
from rest_framework import status
Expand Down
Loading