From a194302a4147e3b25635819a4fdc71d0377d0a4a Mon Sep 17 00:00:00 2001
From: Mathijs van Willigen <mavanwilligen@proxsys.nl>
Date: Mon, 13 Jan 2025 10:34:37 +0100
Subject: [PATCH 1/4] Update Nginx unit to 1.34.1

This fixes the OTel bug in nginx unit 1.34.0.

Signed-off-by: Mathijs van Willigen <mavanwilligen@proxsys.nl>
---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0611f720..50b721b2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -71,8 +71,8 @@ RUN export DEBIAN_FRONTEND=noninteractive \
     && apt-get update -qq \
     && apt-get install \
       --yes -qq --no-install-recommends \
-      unit=1.34.0-1~noble \
-      unit-python3.12=1.34.0-1~noble \
+      unit=1.34.1-1~noble \
+      unit-python3.12=1.34.1-1~noble \
     && rm -rf /var/lib/apt/lists/*
 
 COPY --from=builder /opt/netbox/venv /opt/netbox/venv

From 6fd2681449d3c2d256adeb44de0d6734d1017fad Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 14 Jan 2025 17:12:54 +0000
Subject: [PATCH 2/4] Update dependency sentry-sdk to v2.20.0

---
 requirements-container.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-container.txt b/requirements-container.txt
index 9641dd46..e3095a9f 100644
--- a/requirements-container.txt
+++ b/requirements-container.txt
@@ -2,4 +2,4 @@ django-auth-ldap==5.1.0
 django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.14.4
 dulwich==0.22.7
 python3-saml==1.16.0 --no-binary lxml,xmlsec
-sentry-sdk[django]==2.19.2
+sentry-sdk[django]==2.20.0

From f394400b2bfd9c13dee3210ce6ae557c0c0f5daa Mon Sep 17 00:00:00 2001
From: Marco Kamner <marco.kamner@transporeon.com>
Date: Fri, 17 Jan 2025 15:28:32 +0100
Subject: [PATCH 3/4] Feature: Support ISOLATED_DEPLOYMENT setting

---
 configuration/configuration.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configuration/configuration.py b/configuration/configuration.py
index 9691592f..577c3f4f 100644
--- a/configuration/configuration.py
+++ b/configuration/configuration.py
@@ -348,3 +348,5 @@ def _environ_get_and_map(variable_name: str, default: str | None = None, map_fn:
 # Time zone (default: UTC)
 TIME_ZONE = environ.get('TIME_ZONE', 'UTC')
 
+# If true disables miscellaneous functionality which depends on access to the Internet.
+ISOLATED_DEPLOYMENT = _environ_get_and_map('ISOLATED_DEPLOYMENT', 'False', _AS_BOOL)

From e48a1b685b0600d5b2612aade66870aa0cecb960 Mon Sep 17 00:00:00 2001
From: Tobias Genannt <tobias.genannt@qbeyond.de>
Date: Mon, 20 Jan 2025 08:53:40 +0100
Subject: [PATCH 4/4] Preparation for 3.1.1

---
 VERSION            | 2 +-
 docker-compose.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index fd2a0186..94ff29cc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.1.0
+3.1.1
diff --git a/docker-compose.yml b/docker-compose.yml
index c91c7b71..f222d682 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   netbox: &netbox
-    image: docker.io/netboxcommunity/netbox:${VERSION-v4.2-3.1.0}
+    image: docker.io/netboxcommunity/netbox:${VERSION-v4.2-3.1.1}
     depends_on:
       - postgres
       - redis