From 9142aaf78ea8e6b8cba611b59617aaac9a2cb6fa Mon Sep 17 00:00:00 2001 From: Tobias Genannt Date: Sat, 10 Jul 2021 09:47:54 +0200 Subject: [PATCH 1/3] django-cacheops has been removed from Netbox 3.0.0 --- docker/docker-entrypoint.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 6173db1..1610d8f 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -34,8 +34,6 @@ if ! ./manage.py migrate --check >/dev/null 2>&1; then ./manage.py remove_stale_contenttypes --no-input echo "⚙️ Removing expired user sessions" ./manage.py clearsessions - echo "⚙️ Clearing cache data" - ./manage.py invalidate all fi # Create Superuser if required From 9d476fa9aff1998a097c86abd13420f16147d18c Mon Sep 17 00:00:00 2001 From: Tobias Genannt Date: Wed, 21 Jul 2021 09:58:27 +0200 Subject: [PATCH 2/3] Build documentation files in the image --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 68f41f5..c636a04 100644 --- a/Dockerfile +++ b/Dockerfile @@ -74,6 +74,8 @@ WORKDIR /opt/netbox/netbox # to g+w so that pictures can be uploaded to netbox. RUN mkdir -p static /opt/unit/state/ /opt/unit/tmp/ \ && chmod -R g+w media /opt/unit/ \ + && cd /opt/netbox/ && /opt/netbox/venv/bin/python -m mkdocs build \ + --config-file /opt/netbox/mkdocs.yml --site-dir /opt/netbox/netbox/project-static/docs/ \ && SECRET_KEY="dummy" /opt/netbox/venv/bin/python /opt/netbox/netbox/manage.py collectstatic --no-input ENTRYPOINT [ "/opt/netbox/docker-entrypoint.sh" ] From c5a1557800dda4679bb78a9b3a81450d243b25e1 Mon Sep 17 00:00:00 2001 From: Tobias Genannt Date: Fri, 30 Jul 2021 21:57:50 +0200 Subject: [PATCH 3/3] Removed deprecated settings --- configuration/configuration.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/configuration/configuration.py b/configuration/configuration.py index 18e14a9..87435cf 100644 --- a/configuration/configuration.py +++ b/configuration/configuration.py @@ -108,9 +108,6 @@ BANNER_LOGIN = environ.get('BANNER_LOGIN', '') # BASE_PATH = 'netbox/' BASE_PATH = environ.get('BASE_PATH', '') -# Cache timeout in seconds. Set to 0 to dissable caching. Defaults to 900 (15 minutes) -CACHE_TIMEOUT = int(environ.get('CACHE_TIMEOUT', 900)) - # Maximum number of days to retain logged changes. Set to 0 to retain changes indefinitely. (Default: 90) CHANGELOG_RETENTION = int(environ.get('CHANGELOG_RETENTION', 90)) @@ -212,9 +209,6 @@ REMOTE_AUTH_HEADER = environ.get('REMOTE_AUTH_HEADER', 'HTTP_REMOTE_USER') REMOTE_AUTH_AUTO_CREATE_USER = environ.get('REMOTE_AUTH_AUTO_CREATE_USER', 'True').lower() == 'true' REMOTE_AUTH_DEFAULT_GROUPS = list(filter(None, environ.get('REMOTE_AUTH_DEFAULT_GROUPS', '').split(' '))) -# 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 = int(environ.get('RELEASE_CHECK_TIMEOUT', 24 * 3600)) - # This repository is used to check whether there is a new release of NetBox available. Set to None to disable the # version check or use the URL below to check for release in the official NetBox repository. # https://api.github.com/repos/netbox-community/netbox/releases