19 changed files with 292 additions and 347 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@ -1,8 +1,8 @@
 # These are supported funding model platforms

 github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-  - cimnine
-  - tobiasge
+- cimnine
+- tobiasge
 patreon: # Replace with a single Patreon username
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@ -1,148 +1,148 @@
 name: Bug report
 description: Create a report about a malfunction of the Docker setup
 body:
-  - type: markdown
-    attributes:
-      value: |
-        Please only raise an issue if you're certain that you've found a bug.
-        Else, see these other means to get help:
+- type: markdown
+  attributes:
+    value: |
+      Please only raise an issue if you're certain that you've found a bug.
+      Else, see these other means to get help:

-        - See our troubleshooting section:
-          https://github.com/netbox-community/netbox-docker/wiki/Troubleshooting
-        - Have a look at the rest of the wiki:
-          https://github.com/netbox-community/netbox-docker/wiki
-        - Check the release notes:
-          https://github.com/netbox-community/netbox-docker/releases
-        - Look through the issues already resolved:
-          https://github.com/netbox-community/netbox-docker/issues?q=is%3Aclosed
+      - See our troubleshooting section:
+        https://github.com/netbox-community/netbox-docker/wiki/Troubleshooting
+      - Have a look at the rest of the wiki:
+        https://github.com/netbox-community/netbox-docker/wiki
+      - Check the release notes:
+        https://github.com/netbox-community/netbox-docker/releases
+      - Look through the issues already resolved:
+        https://github.com/netbox-community/netbox-docker/issues?q=is%3Aclosed

-        If you did not find what you're looking for,
-        try the help of our community:
+      If you did not find what you're looking for,
+      try the help of our community:

-        - Post to Github Discussions:
-          https://github.com/netbox-community/netbox-docker/discussions
-        - Join the `#netbox-docker` channel on our Slack:
-          https://join.slack.com/t/netdev-community/shared_invite/zt-mtts8g0n-Sm6Wutn62q_M4OdsaIycrQ
-        - Ask on the NetBox mailing list:
-          https://groups.google.com/d/forum/netbox-discuss
+      - Post to Github Discussions:
+        https://github.com/netbox-community/netbox-docker/discussions
+      - Join the `#netbox-docker` channel on our Slack:
+        https://join.slack.com/t/netdev-community/shared_invite/zt-mtts8g0n-Sm6Wutn62q_M4OdsaIycrQ
+      - Ask on the NetBox mailing list:
+        https://groups.google.com/d/forum/netbox-discuss

-        Please don't open an issue to open a PR.
-        Just submit the PR, that's good enough.
-  - type: textarea
-    id: current-behavior
-    attributes:
-      label: Current Behavior
-      description: Please describe what you did and how you think it misbehaved
-      placeholder: I tried to … by doing …, but it …
-    validations:
-      required: true
-  - type: textarea
-    id: expected-behavior
-    attributes:
-      label: Expected Behavior
-      description: Please describe what you expected instead
-      placeholder: I expected that … when I do …
-    validations:
-      required: true
-  - type: input
-    id: docker-compose-version
-    attributes:
-      label: Docker Compose Version
-      description: Please paste the output of `docker-compose version`
-      placeholder: Docker Compose version vX.Y.Z
-    validations:
-      required: true
-  - type: textarea
-    id: docker-version
-    attributes:
-      label: Docker Version
-      description: Please paste the output of `docker version`
-      render: text
-      placeholder: |
-        Client:
-        Cloud integration: 1.0.17
-        Version:           20.10.8
-        API version:       1.41
-        Go version:        go1.16.6
-        Git commit:        3967b7d
-        Built:             Fri Jul 30 19:55:20 2021
-        OS/Arch:           darwin/amd64
-        Context:           default
-        Experimental:      true
+      Please don't open an issue to open a PR.
+      Just submit the PR, that's good enough.
+- type: textarea
+  id: current-behavior
+  attributes:
+    label: Current Behavior
+    description: Please describe what you did and how you think it misbehaved
+    placeholder: I tried to … by doing …, but it …
+  validations:
+    required: true
+- type: textarea
+  id: expected-behavior
+  attributes:
+    label: Expected Behavior
+    description: Please describe what you expected instead
+    placeholder: I expected that … when I do …
+  validations:
+    required: true
+- type: input
+  id: docker-compose-version
+  attributes:
+    label: Docker Compose Version
+    description: Please paste the output of `docker-compose version`
+    placeholder: Docker Compose version vX.Y.Z
+  validations:
+    required: true
+- type: textarea
+  id: docker-version
+  attributes:
+    label: Docker Version
+    description: Please paste the output of `docker version`
+    render: text
+    placeholder: |
+      Client:
+      Cloud integration: 1.0.17
+      Version:           20.10.8
+      API version:       1.41
+      Go version:        go1.16.6
+      Git commit:        3967b7d
+      Built:             Fri Jul 30 19:55:20 2021
+      OS/Arch:           darwin/amd64
+      Context:           default
+      Experimental:      true

-        Server: Docker Engine - Community
-        Engine:
-          Version:          20.10.8
-          API version:      1.41 (minimum version 1.12)
-          Go version:       go1.16.6
-          Git commit:       75249d8
-          Built:            Fri Jul 30 19:52:10 2021
-          OS/Arch:          linux/amd64
-          Experimental:     false
-        containerd:
-          Version:          1.4.9
-          GitCommit:        e25210fe30a0a703442421b0f60afac609f950a3
-        runc:
-          Version:          1.0.1
-          GitCommit:        v1.0.1-0-g4144b63
-        docker-init:
-          Version:          0.19.0
-          GitCommit:        de40ad0
-    validations:
-      required: true
-  - type: input
-    id: git-rev
-    attributes:
-      label: The git Revision
-      description: Please paste the output of `git rev-parse HEAD`
-    validations:
-      required: true
-  - type: textarea
-    id: git-status
-    attributes:
-      label: The git Status
-      description: Please paste the output of `git status`
-      render: text
-      placeholder: |
-        On branch main
-        nothing to commit, working tree clean
-    validations:
-      required: true
-  - type: input
-    id: run-command
-    attributes:
-      label: Startup Command
-      description: Please specify the command you used to start the project
-      placeholder: docker compose up
-    validations:
-      required: true
-  - type: textarea
-    id: netbox-logs
-    attributes:
-      label: NetBox Logs
-      description: Please paste the output of `docker-compose logs netbox` (or `docker compose logs netbox`)
-      render: text
-      placeholder: |
-        netbox_1  | ⚙️ Applying database migrations
-        netbox_1  | 🧬 loaded config '/etc/netbox/config/configuration.py'
-        netbox_1  | 🧬 loaded config '/etc/netbox/config/a.py'
-        netbox_1  | 🧬 loaded config '/etc/netbox/config/extra.py'
-        netbox_1  | 🧬 loaded config '/etc/netbox/config/logging.py'
-        netbox_1  | 🧬 loaded config '/etc/netbox/config/plugins.py'
-        ...
-    validations:
-      required: true
-  - type: textarea
-    id: docker-compose-override-yml
-    attributes:
-      label: Content of docker-compose.override.yml
-      description: Please paste the output of `cat docker-compose.override.yml`
-      render: yaml
-      placeholder: |
-        version: '3.4'
-        services:
-          netbox:
-            ports:
-              - '8080:8080'
-    validations:
-      required: true
+      Server: Docker Engine - Community
+      Engine:
+        Version:          20.10.8
+        API version:      1.41 (minimum version 1.12)
+        Go version:       go1.16.6
+        Git commit:       75249d8
+        Built:            Fri Jul 30 19:52:10 2021
+        OS/Arch:          linux/amd64
+        Experimental:     false
+      containerd:
+        Version:          1.4.9
+        GitCommit:        e25210fe30a0a703442421b0f60afac609f950a3
+      runc:
+        Version:          1.0.1
+        GitCommit:        v1.0.1-0-g4144b63
+      docker-init:
+        Version:          0.19.0
+        GitCommit:        de40ad0
+  validations:
+    required: true
+- type: input
+  id: git-rev
+  attributes:
+    label: The git Revision
+    description: Please paste the output of `git rev-parse HEAD`
+  validations:
+    required: true
+- type: textarea
+  id: git-status
+  attributes:
+    label: The git Status
+    description: Please paste the output of `git status`
+    render: text
+    placeholder: |
+      On branch main
+      nothing to commit, working tree clean
+  validations:
+    required: true
+- type: input
+  id: run-command
+  attributes:
+    label: Startup Command
+    description: Please specify the command you used to start the project
+    placeholder: docker compose up
+  validations:
+    required: true
+- type: textarea
+  id: netbox-logs
+  attributes:
+    label: NetBox Logs
+    description: Please paste the output of `docker-compose logs netbox` (or `docker compose logs netbox`)
+    render: text
+    placeholder: |
+      netbox_1  | ⚙️ Applying database migrations
+      netbox_1  | 🧬 loaded config '/etc/netbox/config/configuration.py'
+      netbox_1  | 🧬 loaded config '/etc/netbox/config/a.py'
+      netbox_1  | 🧬 loaded config '/etc/netbox/config/extra.py'
+      netbox_1  | 🧬 loaded config '/etc/netbox/config/logging.py'
+      netbox_1  | 🧬 loaded config '/etc/netbox/config/plugins.py'
+      ...
+  validations:
+    required: true
+- type: textarea
+  id: docker-compose-override-yml
+  attributes:
+    label: Content of docker-compose.override.yml
+    description: Please paste the output of `cat docker-compose.override.yml`
+    render: yaml
+    placeholder: |
+      version: '3.4'
+      services:
+        netbox:
+          ports:
+            - '8080:8080'
+  validations:
+    required: true
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -6,7 +6,7 @@ contact_links:

  - name: Chat
    url: https://join.slack.com/t/netdev-community/shared_invite/zt-mtts8g0n-Sm6Wutn62q_M4OdsaIycrQ
-    about: "Usually the quickest way to seek help with small issues is to join our #netbox-docker Slack channel."
+    about: 'Usually the quickest way to seek help with small issues is to join our #netbox-docker Slack channel.'

  - name: Community Wiki
    url: https://github.com/netbox-community/netbox-docker/wiki
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@ -1,68 +1,68 @@
 name: Feature or Change Request
 description: Request a new feature or a change of the current behavior
 body:
-  - type: markdown
-    attributes:
-      value: |
-        This issue type is to propose new features for the Docker setup.
-        To just spin an idea, see the Github Discussions section, please.
+- type: markdown
+  attributes:
+    value: |
+      This issue type is to propose new features for the Docker setup.
+      To just spin an idea, see the Github Discussions section, please.

-        Before asking for help, see these links first:
+      Before asking for help, see these links first:

-        - See our troubleshooting section:
-          https://github.com/netbox-community/netbox-docker/wiki/Troubleshooting
-        - Have a look at the rest of the wiki:
-          https://github.com/netbox-community/netbox-docker/wiki
-        - Check the release notes:
-          https://github.com/netbox-community/netbox-docker/releases
-        - Look through the issues already resolved:
-          https://github.com/netbox-community/netbox-docker/issues?q=is%3Aclosed
+      - See our troubleshooting section:
+        https://github.com/netbox-community/netbox-docker/wiki/Troubleshooting
+      - Have a look at the rest of the wiki:
+        https://github.com/netbox-community/netbox-docker/wiki
+      - Check the release notes:
+        https://github.com/netbox-community/netbox-docker/releases
+      - Look through the issues already resolved:
+        https://github.com/netbox-community/netbox-docker/issues?q=is%3Aclosed

-        If you did not find what you're looking for,
-        try the help of our community:
+      If you did not find what you're looking for,
+      try the help of our community:

-        - Post to Github Discussions:
-          https://github.com/netbox-community/netbox-docker/discussions
-        - Join the `#netbox-docker` channel on our Slack:
-          https://join.slack.com/t/netdev-community/shared_invite/zt-mtts8g0n-Sm6Wutn62q_M4OdsaIycrQ
-        - Ask on the NetBox mailing list:
-          https://groups.google.com/d/forum/netbox-discuss
+      - Post to Github Discussions:
+        https://github.com/netbox-community/netbox-docker/discussions
+      - Join the `#netbox-docker` channel on our Slack:
+        https://join.slack.com/t/netdev-community/shared_invite/zt-mtts8g0n-Sm6Wutn62q_M4OdsaIycrQ
+      - Ask on the NetBox mailing list:
+        https://groups.google.com/d/forum/netbox-discuss

-        Please don't open an issue to open a PR.
-        Just submit the PR, that's good enough.
-  - type: textarea
-    id: desired-behavior
-    attributes:
-      label: Desired Behavior
-      description: Please describe the desired behavior
-      placeholder: To me, it would be useful, if … because …
-    validations:
-      required: true
-  - type: textarea
-    id: contrast-to-current
-    attributes:
-      label: Contrast to Current Behavior
-      description: Please describe how the desired behavior is different from the current behavior
-      placeholder: The current behavior is …, but this lacks …
-    validations:
-      required: true
-  - type: textarea
-    id: required-changes
-    attributes:
-      label: Required Changes
-      description: If you can, please elaborate what changes will be required to implement the desired behavior
-      placeholder: I suggest to change the file …
-    validations:
-      required: false
-  - type: textarea
-    id: discussion
-    attributes:
-      label: "Discussion: Benefits and Drawbacks"
-      description: |
-        Please make your case here:
-        - Why do you think this project and the community will benefit from your suggestion?
-        - What are the drawbacks of this change? Is it backwards-compatible?
-        - Anything else that you think is relevant to the discussion of this feature/change request.
-      placeholder: I suggest to change the file …
-    validations:
-      required: false
+      Please don't open an issue to open a PR.
+      Just submit the PR, that's good enough.
+- type: textarea
+  id: desired-behavior
+  attributes:
+    label: Desired Behavior
+    description: Please describe the desired behavior
+    placeholder: To me, it would be useful, if … because …
+  validations:
+    required: true
+- type: textarea
+  id: contrast-to-current
+  attributes:
+    label: Contrast to Current Behavior
+    description: Please describe how the desired behavior is different from the current behavior
+    placeholder: The current behavior is …, but this lacks …
+  validations:
+    required: true
+- type: textarea
+  id: required-changes
+  attributes:
+    label: Required Changes
+    description: If you can, please elaborate what changes will be required to implement the desired behavior
+    placeholder: I suggest to change the file …
+  validations:
+    required: false
+- type: textarea
+  id: discussion
+  attributes:
+    label: 'Discussion: Benefits and Drawbacks'
+    description: |
+      Please make your case here:
+      - Why do you think this project and the community will benefit from your suggestion?
+      - What are the drawbacks of this change? Is it backwards-compatible?
+      - Anything else that you think is relevant to the discussion of this feature/change request.
+    placeholder: I suggest to change the file …
+  validations:
+    required: false
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@ -80,6 +80,6 @@ into the release notes.
 Please put an x into the brackets (like `[x]`) if you've completed that task.
 -->

- [ ] I have read the comments and followed the PR template.
- [ ] I have explained my PR according to the information in the comments.
- [ ] My PR targets the `develop` branch.
+* [ ] I have read the comments and followed the PR template.
+* [ ] I have explained my PR according to the information in the comments.
+* [ ] My PR targets the `develop` branch.
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@ -26,9 +26,9 @@ jobs:
          fetch-depth: 0
      - uses: actions/setup-python@v5
        with:
-          python-version: "3.9"
+          python-version: '3.9'
      - name: Lint Code Base
-        uses: github/super-linter@v7
+        uses: github/super-linter@v6
        env:
          DEFAULT_BRANCH: develop
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -6,7 +6,7 @@ on:
    types:
      - published
  schedule:
-    - cron: "45 5 * * *"
+    - cron: '45 5 * * *'
  workflow_dispatch:

 jobs:
@ -35,11 +35,19 @@ jobs:
        name: Get Version of NetBox Docker
        run: echo "version=$(cat VERSION)" >>"$GITHUB_OUTPUT"
        shell: bash
-      - id: check-build-needed
-        name: Check if the build is needed for '${{ matrix.build_cmd }}'
-        env:
-          CHECK_ONLY: "true"
+      - id: qemu-setup
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - id: buildx-setup
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - id: docker-build
+        name: Build the image with '${{ matrix.build_cmd }}'
        run: ${{ matrix.build_cmd }}
+      - id: test-image
+        name: Test the image
+        run: IMAGE="${FINAL_DOCKER_TAG}" ./test.sh
+        if: steps.docker-build.outputs.skipped != 'true'
      # docker.io
      - id: docker-io-login
        name: Login to docker.io
@ -48,15 +56,7 @@ jobs:
          registry: docker.io
          username: ${{ secrets.dockerhub_username }}
          password: ${{ secrets.dockerhub_password }}
-        if: steps.check-build-needed.outputs.skipped != 'true'
-      - id: buildx-setup
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          version: "lab:latest"
-          driver: cloud
-          endpoint: "netboxcommunity/netbox-default"
-        if: steps.check-build-needed.outputs.skipped != 'true'
+        if: steps.docker-build.outputs.skipped != 'true'
      # quay.io
      - id: quay-io-login
        name: Login to Quay.io
@ -65,7 +65,7 @@ jobs:
          registry: quay.io
          username: ${{ secrets.quayio_username }}
          password: ${{ secrets.quayio_password }}
-        if: steps.check-build-needed.outputs.skipped != 'true'
+        if: steps.docker-build.outputs.skipped != 'true'
      # ghcr.io
      - id: ghcr-io-login
        name: Login to GitHub Container Registry
@ -74,11 +74,11 @@ jobs:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
          password: ${{ secrets.GITHUB_TOKEN }}
-        if: steps.check-build-needed.outputs.skipped != 'true'
+        if: steps.docker-build.outputs.skipped != 'true'
      - id: build-and-push
        name: Push the image
        run: ${{ matrix.build_cmd }} --push
-        if: steps.check-build-needed.outputs.skipped != 'true'
+        if: steps.docker-build.outputs.skipped != 'true'
        env:
          BUILDX_PLATFORM: ${{ matrix.platform }}
          BUILDX_BUILDER_NAME: ${{ steps.buildx-setup.outputs.name }}
--- a/.gitignore
+++ b/.gitignore
@ -1,6 +1,7 @@
 *.sql.gz
 .netbox
 .python-version
+docker-compose.override.yml
 *.pem
 configuration/*
 !configuration/configuration.py
--- a/.yamllint.yaml
+++ b/.yamllint.yaml
@ -1,4 +1,5 @@
 ---
+
 rules:
  line-length:
-    max: 160
+    max: 120
--- a/11
+++ b/11
@ -1,5 +1,5 @@
 ARG FROM
-FROM ${FROM} AS builder
+FROM ${FROM} as builder

 RUN export DEBIAN_FRONTEND=noninteractive \
    && apt-get update -qq \
@ -46,7 +46,7 @@ RUN \
 ###

 ARG FROM
-FROM ${FROM} AS main
+FROM ${FROM} as main

 RUN export DEBIAN_FRONTEND=noninteractive \
    && apt-get update -qq \
@ -63,16 +63,17 @@ RUN export DEBIAN_FRONTEND=noninteractive \
      openssh-client \
      openssl \
      python3 \
+      python3-distutils \
      tini \
    && curl --silent --output /usr/share/keyrings/nginx-keyring.gpg \
      https://unit.nginx.org/keys/nginx-keyring.gpg \
-    && echo "deb [signed-by=/usr/share/keyrings/nginx-keyring.gpg] https://packages.nginx.org/unit/ubuntu/ noble unit" \
+    && echo "deb [signed-by=/usr/share/keyrings/nginx-keyring.gpg] https://packages.nginx.org/unit/ubuntu/ mantic unit" \
      > /etc/apt/sources.list.d/unit.list \
    && apt-get update -qq \
    && apt-get install \
      --yes -qq --no-install-recommends \
-      unit=1.33.0-1~noble \
-      unit-python3.12=1.33.0-1~noble \
+      unit=1.32.0-1~mantic \
+      unit-python3.11=1.32.0-1~mantic \
    && rm -rf /var/lib/apt/lists/*

 COPY --from=builder /opt/netbox/venv /opt/netbox/venv
--- a/2
+++ b/2
@ -1 +1 @@
-3.0.2
+2.9.1
--- a/build.sh
+++ b/build.sh
@ -61,7 +61,7 @@ DOCKERFILE  The name of Dockerfile to use.
            ${_GREEN}Default:${_CLEAR} Dockerfile

 DOCKER_FROM The base image to use.
-            ${_GREEN}Default:${_CLEAR} 'ubuntu:24.04'
+            ${_GREEN}Default:${_CLEAR} 'ubuntu:23.10'

 BUILDX_PLATFORMS
            Specifies the platform(s) to build the image for.
@ -103,8 +103,6 @@ GH_ACTION   If defined, special 'echo' statements are enabled that set the
            - FINAL_DOCKER_TAG: The final value of the DOCKER_TAG env variable
            ${_GREEN}Default:${_CLEAR} undefined

-CHECK_ONLY  Only checks if the build is needed and sets the GH Action output.
-
 ${_BOLD}Examples:${_CLEAR}

 ${0} master
@ -221,7 +219,7 @@ fi
 # Determining the value for DOCKER_FROM
 ###
 if [ -z "$DOCKER_FROM" ]; then
-  DOCKER_FROM="docker.io/ubuntu:24.04"
+  DOCKER_FROM="docker.io/ubuntu:23.10"
 fi

 ###
@ -357,11 +355,6 @@ else
 fi
 gh_echo "::endgroup::"

-if [ "${CHECK_ONLY}" = "true" ]; then
-  echo "Only check if build needed was requested. Exiting"
-  exit 0
-fi
-
 ###
 # Build the image
 ###
--- a/configuration/configuration.py
+++ b/configuration/configuration.py
@ -200,10 +200,10 @@ if 'CENSUS_REPORTING_ENABLED' in environ:
 EXEMPT_VIEW_PERMISSIONS = _environ_get_and_map('EXEMPT_VIEW_PERMISSIONS', '', _AS_LIST)

 # HTTP proxies NetBox should use when sending outbound HTTP requests (e.g. for webhooks).
-HTTP_PROXIES = {
-    'http': environ.get('HTTP_PROXY', None),
-    'https': environ.get('HTTPS_PROXY', None),
-}
+# HTTP_PROXIES = {
+#     'http': 'http://10.10.1.10:3128',
+#     'https': 'http://10.10.1.10:1080',
+# }

 # IP addresses recognized as internal to the system. The debugging toolbar will be available only to clients accessing
 # NetBox from an internal IP.
@ -221,9 +221,9 @@ if 'GRAPHQL_ENABLED' in environ:
 # authenticated to NetBox indefinitely.
 LOGIN_PERSISTENCE = _environ_get_and_map('LOGIN_PERSISTENCE', 'False', _AS_BOOL)

-# When enabled, only authenticated users are permitted to access any part of NetBox.
-# Disabling this will allow unauthenticated users to access most areas of NetBox (but not make any changes).
-LOGIN_REQUIRED = _environ_get_and_map('LOGIN_REQUIRED', 'True', _AS_BOOL)
+# Setting this to True will permit only authenticated users to access any part of NetBox. By default, anonymous users
+# are permitted to access most data in NetBox (excluding secrets) but not make any changes.
+LOGIN_REQUIRED = _environ_get_and_map('LOGIN_REQUIRED', 'False', _AS_BOOL)

 # The length of time (in seconds) for which a user will remain logged into the web UI before being prompted to
 # re-authenticate. (Default: 1209600 [14 days])
@ -286,23 +286,12 @@ if 'RACK_ELEVATION_DEFAULT_UNIT_WIDTH' in environ:
    RACK_ELEVATION_DEFAULT_UNIT_WIDTH = _environ_get_and_map('RACK_ELEVATION_DEFAULT_UNIT_WIDTH', None, _AS_INT)

 # Remote authentication support
-REMOTE_AUTH_AUTO_CREATE_GROUPS = _environ_get_and_map('REMOTE_AUTH_AUTO_CREATE_GROUPS', 'False', _AS_BOOL)
-REMOTE_AUTH_AUTO_CREATE_USER = _environ_get_and_map('REMOTE_AUTH_AUTO_CREATE_USER', 'False', _AS_BOOL)
-REMOTE_AUTH_BACKEND = _environ_get_and_map('REMOTE_AUTH_BACKEND', 'netbox.authentication.RemoteUserBackend', _AS_LIST)
-REMOTE_AUTH_DEFAULT_GROUPS = _environ_get_and_map('REMOTE_AUTH_DEFAULT_GROUPS', '', _AS_LIST)
-# REMOTE_AUTH_DEFAULT_PERMISSIONS = {} # dicts can't be configured via environment variables. See extra.py instead.
 REMOTE_AUTH_ENABLED = _environ_get_and_map('REMOTE_AUTH_ENABLED', 'False', _AS_BOOL)
-REMOTE_AUTH_GROUP_HEADER = _environ_get_and_map('REMOTE_AUTH_GROUP_HEADER', 'HTTP_REMOTE_USER_GROUP')
-REMOTE_AUTH_GROUP_SEPARATOR = _environ_get_and_map('REMOTE_AUTH_GROUP_SEPARATOR', '|')
-REMOTE_AUTH_GROUP_SYNC_ENABLED = _environ_get_and_map('REMOTE_AUTH_GROUP_SYNC_ENABLED', 'False', _AS_BOOL)
+REMOTE_AUTH_BACKEND = _environ_get_and_map('REMOTE_AUTH_BACKEND', 'netbox.authentication.RemoteUserBackend', _AS_LIST)
 REMOTE_AUTH_HEADER = environ.get('REMOTE_AUTH_HEADER', 'HTTP_REMOTE_USER')
-REMOTE_AUTH_USER_EMAIL = environ.get('REMOTE_AUTH_USER_EMAIL', 'HTTP_REMOTE_USER_EMAIL')
-REMOTE_AUTH_USER_FIRST_NAME = environ.get('REMOTE_AUTH_USER_FIRST_NAME', 'HTTP_REMOTE_USER_FIRST_NAME')
-REMOTE_AUTH_USER_LAST_NAME = environ.get('REMOTE_AUTH_USER_LAST_NAME', 'HTTP_REMOTE_USER_LAST_NAME')
-REMOTE_AUTH_SUPERUSER_GROUPS = _environ_get_and_map('REMOTE_AUTH_SUPERUSER_GROUPS', '', _AS_LIST)
-REMOTE_AUTH_SUPERUSERS = _environ_get_and_map('REMOTE_AUTH_SUPERUSERS', '', _AS_LIST)
-REMOTE_AUTH_STAFF_GROUPS = _environ_get_and_map('REMOTE_AUTH_STAFF_GROUPS', '', _AS_LIST)
-REMOTE_AUTH_STAFF_USERS = _environ_get_and_map('REMOTE_AUTH_STAFF_USERS', '', _AS_LIST)
+REMOTE_AUTH_AUTO_CREATE_USER = _environ_get_and_map('REMOTE_AUTH_AUTO_CREATE_USER', 'False', _AS_BOOL)
+REMOTE_AUTH_DEFAULT_GROUPS = _environ_get_and_map('REMOTE_AUTH_DEFAULT_GROUPS', '', _AS_LIST)
+# REMOTE_AUTH_DEFAULT_PERMISSIONS = {}

 # 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.
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@ -1,21 +0,0 @@
-services:
-  netbox:
-    ports:
-      - "8000:8080"
-    # If you want the Nginx unit status page visible from the
-    # outside of the container add the following port mapping:
-    # - "8001:8081"
-    # healthcheck:
-      # Time for which the health check can fail after the container is started.
-      # This depends mostly on the performance of your database. On the first start,
-      # when all tables need to be created the start_period should be higher than on
-      # subsequent starts. For the first start after major version upgrades of NetBox
-      # the start_period might also need to be set higher.
-      # Default value in our docker-compose.yml is 60s
-      # start_period: 90s
-    # environment:
-      # SKIP_SUPERUSER: "false"
-      # SUPERUSER_API_TOKEN: ""
-      # SUPERUSER_EMAIL: ""
-      # SUPERUSER_NAME: ""
-      # SUPERUSER_PASSWORD: ""
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@ -1,6 +1,6 @@
 services:
  netbox: &netbox
-    image: ${IMAGE-docker.io/netboxcommunity/netbox:latest}
+    image: ${IMAGE-netboxcommunity/netbox:latest}
    depends_on:
      postgres:
        condition: service_healthy
@ -13,10 +13,10 @@ services:
    volumes:
    - ./test-configuration/test_config.py:/etc/netbox/config/test_config.py:z,ro
    healthcheck:
-      test: curl -f http://localhost:8080/login/ || exit 1
      start_period: ${NETBOX_START_PERIOD-120s}
      timeout: 3s
      interval: 15s
+      test: "curl -f http://localhost:8080/api/ || exit 1"
  netbox-worker:
    <<: *netbox
    command:
@ -24,47 +24,42 @@ services:
    - /opt/netbox/netbox/manage.py
    - rqworker
    healthcheck:
-      test: ps -aux | grep -v grep | grep -q rqworker || exit 1
      start_period: 40s
      timeout: 3s
      interval: 15s
+      test: "ps -aux | grep -v grep | grep -q rqworker || exit 1"
  netbox-housekeeping:
    <<: *netbox
    command:
    - /opt/netbox/housekeeping.sh
    healthcheck:
-      test: ps -aux | grep -v grep | grep -q housekeeping || exit 1
      start_period: 40s
      timeout: 3s
      interval: 15s
-
+      test: "ps -aux | grep -v grep | grep -q housekeeping || exit 1"
  postgres:
-    image: docker.io/postgres:16-alpine
+    image: postgres:16-alpine
    env_file: env/postgres.env
    healthcheck:
-      test: pg_isready -q -t 2 -d $$POSTGRES_DB -U $$POSTGRES_USER ## $$ because of docker-compose
-      start_period: 20s
-      interval: 1s
+      test: "pg_isready -t 2 -d $$POSTGRES_DB -U $$POSTGRES_USER" ## $$ because of docker-compose
+      interval: 10s
      timeout: 5s
      retries: 5
-
  redis: &redis
-    image: docker.io/valkey/valkey:8.0-alpine
+    image: redis:7-alpine
    command:
    - sh
    - -c # this is to evaluate the $REDIS_PASSWORD from the env
-    - valkey-server --save "" --appendonly no --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
+    - redis-server --appendonly yes --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
    env_file: env/redis.env
    healthcheck:
-      test: "[ $$(valkey-cli --pass \"$${REDIS_PASSWORD}\" ping) = 'PONG' ]"
-      start_period: 5s
+      start_period: 20s
      timeout: 3s
-      interval: 1s
-      retries: 5
+      interval: 15s
+      test: "timeout 2 redis-cli ping"
  redis-cache:
    <<: *redis
    env_file: env/redis-cache.env
-
 volumes:
  netbox-media-files:
    driver: local
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,88 +1,75 @@
 services:
  netbox: &netbox
-    image: docker.io/netboxcommunity/netbox:${VERSION-v4.1-3.0.2}
+    image: docker.io/netboxcommunity/netbox:${VERSION-v4.0-2.9.1}
    depends_on:
-      - postgres
-      - redis
-      - redis-cache
+    - postgres
+    - redis
+    - redis-cache
    env_file: env/netbox.env
-    user: "unit:root"
+    user: 'unit:root'
    healthcheck:
-      test: curl -f http://localhost:8080/login/ || exit 1
-      start_period: 90s
+      start_period: 60s
      timeout: 3s
      interval: 15s
+      test: "curl -f http://localhost:8080/login/ || exit 1"
    volumes:
-      - ./configuration:/etc/netbox/config:z,ro
-      - netbox-media-files:/opt/netbox/netbox/media:rw
-      - netbox-reports-files:/opt/netbox/netbox/reports:rw
-      - netbox-scripts-files:/opt/netbox/netbox/scripts:rw
+    - ./configuration:/etc/netbox/config:z,ro
+    - netbox-media-files:/opt/netbox/netbox/media:rw
+    - netbox-reports-files:/opt/netbox/netbox/reports:rw
+    - netbox-scripts-files:/opt/netbox/netbox/scripts:rw
  netbox-worker:
    <<: *netbox
    depends_on:
      netbox:
        condition: service_healthy
    command:
-      - /opt/netbox/venv/bin/python
-      - /opt/netbox/netbox/manage.py
-      - rqworker
+    - /opt/netbox/venv/bin/python
+    - /opt/netbox/netbox/manage.py
+    - rqworker
    healthcheck:
-      test: ps -aux | grep -v grep | grep -q rqworker || exit 1
      start_period: 20s
      timeout: 3s
      interval: 15s
+      test: "ps -aux | grep -v grep | grep -q rqworker || exit 1"
  netbox-housekeeping:
    <<: *netbox
    depends_on:
      netbox:
        condition: service_healthy
    command:
-      - /opt/netbox/housekeeping.sh
+    - /opt/netbox/housekeeping.sh
    healthcheck:
-      test: ps -aux | grep -v grep | grep -q housekeeping || exit 1
      start_period: 20s
      timeout: 3s
      interval: 15s
+      test: "ps -aux | grep -v grep | grep -q housekeeping || exit 1"

  # postgres
  postgres:
    image: docker.io/postgres:16-alpine
-    healthcheck:
-      test: pg_isready -q -t 2 -d $$POSTGRES_DB -U $$POSTGRES_USER
-      start_period: 20s
-      timeout: 30s
-      interval: 10s
-      retries: 5
    env_file: env/postgres.env
    volumes:
-      - netbox-postgres-data:/var/lib/postgresql/data
+    - netbox-postgres-data:/var/lib/postgresql/data

  # redis
  redis:
-    image: docker.io/valkey/valkey:8.0-alpine
+    image: docker.io/redis:7-alpine
    command:
-      - sh
-      - -c # this is to evaluate the $REDIS_PASSWORD from the env
-      - valkey-server --appendonly yes --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
-    healthcheck: &redis-healthcheck
-      test: '[ $$(valkey-cli --pass "$${REDIS_PASSWORD}" ping) = ''PONG'' ]'
-      start_period: 5s
-      timeout: 3s
-      interval: 1s
-      retries: 5
+    - sh
+    - -c # this is to evaluate the $REDIS_PASSWORD from the env
+    - redis-server --appendonly yes --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
    env_file: env/redis.env
    volumes:
-      - netbox-redis-data:/data
+    - netbox-redis-data:/data
  redis-cache:
-    image: docker.io/valkey/valkey:8.0-alpine
+    image: docker.io/redis:7-alpine
    command:
-      - sh
-      - -c # this is to evaluate the $REDIS_PASSWORD from the env
-      - valkey-server --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
-    healthcheck: *redis-healthcheck
+    - sh
+    - -c # this is to evaluate the $REDIS_PASSWORD from the env
+    - redis-server --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
    env_file: env/redis-cache.env
    volumes:
-      - netbox-redis-cache-data:/data
+    - netbox-redis-cache-data:/data

 volumes:
  netbox-media-files:
--- a/requirements-container.txt
+++ b/requirements-container.txt
@ -1,5 +1,5 @@
 django-auth-ldap==4.8.0
-django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.14.4
+django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.14.3
 dulwich==0.22.1
-python3-saml==1.16.0 --no-binary lxml,xmlsec
-sentry-sdk[django]==2.14.0
+python3-saml==1.16.0 --no-binary lxml
+sentry-sdk[django]==2.1.1
--- a/test-configuration/test_config.py
+++ b/test-configuration/test_config.py
@ -4,4 +4,3 @@ LOGGING = {
 }

 DEFAULT_PERMISSIONS = {}
-LOGIN_REQUIRED = False
--- a/test.sh
+++ b/test.sh
@ -84,7 +84,7 @@ test_netbox_web() {
      --retry 5 \
      --retry-delay 0 \
      --retry-max-time 40 \
-      http://127.0.0.1:8000/login/
+      http://127.0.0.1:8000/
  )
  if [ "$RESP_CODE" == "200" ]; then
    echo "Webservice running"
 @ -1 +1 @@
 .0.2
 .9.1