From 9680c8d24a2704bbc0dcf1f95275c33574368f7d Mon Sep 17 00:00:00 2001 From: thespad Date: Sun, 4 Jan 2026 21:51:18 +0000 Subject: [PATCH] Rebase to 3.23 --- .editorconfig | 0 .github/CONTRIBUTING.md | 0 .github/FUNDING.yml | 0 .github/ISSUE_TEMPLATE/config.yml | 0 .github/ISSUE_TEMPLATE/issue.bug.yml | 0 .github/ISSUE_TEMPLATE/issue.feature.yml | 0 .github/workflows/call_issue_pr_tracker.yml | 0 .github/workflows/call_issues_cron.yml | 0 .github/workflows/greetings.yml | 0 .github/workflows/permissions.yml | 0 Dockerfile | 4 ++-- Dockerfile.aarch64 | 4 ++-- LICENSE | 0 README.md | 21 ++++++++++++------ readme-vars.yml | 19 +++++++++------- root/defaults/configuration.py | 22 +++++++++++++------ root/defaults/uwsgi.ini | 2 +- .../s6-overlay/s6-rc.d/init-netbox-config/run | 4 +++- .../dependencies.d/init-mods-end} | 0 .../run | 0 .../type | 0 .../s6-overlay/s6-rc.d/init-netbox-prepare/up | 1 + .../s6-overlay/s6-rc.d/svc-netbox-prepare/up | 1 - .../s6-overlay/s6-rc.d/svc-netbox/data/check | 8 +++++++ ...svc-netbox-prepare => init-netbox-prepare} | 0 root/etc/s6-overlay/s6-rc.d/svc-netbox/run | 2 +- ...svc-netbox-prepare => init-netbox-prepare} | 0 27 files changed, 58 insertions(+), 30 deletions(-) mode change 100755 => 100644 .editorconfig mode change 100755 => 100644 .github/CONTRIBUTING.md mode change 100755 => 100644 .github/FUNDING.yml mode change 100755 => 100644 .github/ISSUE_TEMPLATE/config.yml mode change 100755 => 100644 .github/ISSUE_TEMPLATE/issue.bug.yml mode change 100755 => 100644 .github/ISSUE_TEMPLATE/issue.feature.yml mode change 100755 => 100644 .github/workflows/call_issue_pr_tracker.yml mode change 100755 => 100644 .github/workflows/call_issues_cron.yml mode change 100755 => 100644 .github/workflows/greetings.yml mode change 100755 => 100644 .github/workflows/permissions.yml mode change 100755 => 100644 LICENSE rename root/etc/s6-overlay/s6-rc.d/{svc-netbox-prepare/dependencies.d/init-services => init-netbox-prepare/dependencies.d/init-mods-end} (100%) rename root/etc/s6-overlay/s6-rc.d/{svc-netbox-prepare => init-netbox-prepare}/run (100%) rename root/etc/s6-overlay/s6-rc.d/{svc-netbox-prepare => init-netbox-prepare}/type (100%) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-netbox-prepare/up delete mode 100644 root/etc/s6-overlay/s6-rc.d/svc-netbox-prepare/up create mode 100755 root/etc/s6-overlay/s6-rc.d/svc-netbox/data/check rename root/etc/s6-overlay/s6-rc.d/svc-netbox/dependencies.d/{svc-netbox-prepare => init-netbox-prepare} (100%) rename root/etc/s6-overlay/s6-rc.d/user/contents.d/{svc-netbox-prepare => init-netbox-prepare} (100%) diff --git a/.editorconfig b/.editorconfig old mode 100755 new mode 100644 diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md old mode 100755 new mode 100644 diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/issue.bug.yml b/.github/ISSUE_TEMPLATE/issue.bug.yml old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/issue.feature.yml b/.github/ISSUE_TEMPLATE/issue.feature.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/call_issues_cron.yml b/.github/workflows/call_issues_cron.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml old mode 100755 new mode 100644 diff --git a/Dockerfile b/Dockerfile index 253c5e7..916e583 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:3.20 +FROM ghcr.io/linuxserver/baseimage-alpine:3.23 # set version label ARG BUILD_DATE @@ -49,7 +49,7 @@ RUN \ pip install -U --no-cache-dir \ pip \ wheel && \ - pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ -r requirements.txt && \ + pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.23/ -r requirements.txt && \ pip install --no-cache-dir django-auth-ldap && \ printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 9a212fd..d3622d6 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.23 # set version label ARG BUILD_DATE @@ -49,7 +49,7 @@ RUN \ pip install -U --no-cache-dir \ pip \ wheel && \ - pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ -r requirements.txt && \ + pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.23/ -r requirements.txt && \ pip install --no-cache-dir django-auth-ldap && \ printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ diff --git a/LICENSE b/LICENSE old mode 100755 new mode 100644 diff --git a/README.md b/README.md index 7c2f6b7..43193df 100644 --- a/README.md +++ b/README.md @@ -89,10 +89,12 @@ services: - DB_PORT= - REDIS_HOST= - REDIS_PORT= + - REDIS_USERNAME= - REDIS_PASSWORD= - REDIS_DB_TASK= - REDIS_DB_CACHE= - BASE_PATH= #optional + - CSRF_TRUSTED_ORIGINS= #optional - REMOTE_AUTH_ENABLED= #optional - REMOTE_AUTH_BACKEND= #optional - REMOTE_AUTH_HEADER= #optional @@ -124,10 +126,12 @@ docker run -d \ -e DB_PORT= \ -e REDIS_HOST= \ -e REDIS_PORT= \ + -e REDIS_USERNAME= \ -e REDIS_PASSWORD= \ -e REDIS_DB_TASK= \ -e REDIS_DB_CACHE= \ -e BASE_PATH= `#optional` \ + -e CSRF_TRUSTED_ORIGINS= `#optional` \ -e REMOTE_AUTH_ENABLED= `#optional` \ -e REMOTE_AUTH_BACKEND= `#optional` \ -e REMOTE_AUTH_HEADER= `#optional` \ @@ -160,16 +164,18 @@ Containers are configured using parameters passed at runtime (such as those abov | `-e DB_PORT=` | Database port (default: 5432) | | `-e REDIS_HOST=` | Redis host (default: redis) | | `-e REDIS_PORT=` | Redis port number (default: 6379) | +| `-e REDIS_USERNAME=` | Redis username (default: none) | | `-e REDIS_PASSWORD=` | Redis password (default: none) | | `-e REDIS_DB_TASK=` | Redis database ID for tasks (default: 0) | | `-e REDIS_DB_CACHE=` | Redis database ID for caching (default: 1) | -| `-e BASE_PATH=` | The path you will use to access the app (i.e., /netbox, optional, default: none) | -| `-e REMOTE_AUTH_ENABLED=` | Enable remote authentication (optional, default: False) | -| `-e REMOTE_AUTH_BACKEND=` | Python path to the custom Django authentication backend to use for external user authentication (optional, default: netbox.authentication.RemoteUserBackend) | -| `-e REMOTE_AUTH_HEADER=` | Name of the HTTP header which informs NetBox of the currently authenticated user. (optional, default: HTTP_REMOTE_USER) | -| `-e REMOTE_AUTH_AUTO_CREATE_USER=` | If true, NetBox will automatically create local accounts for users authenticated via a remote service (optional, default: False) | -| `-e REMOTE_AUTH_DEFAULT_GROUPS=` | The list of groups to assign a new user account when created using remote authentication (optional, default: []) | -| `-e REMOTE_AUTH_DEFAULT_PERMISSIONS=` | A mapping of permissions to assign a new user account when created using remote authentication (optional, default: {}) | +| `-e BASE_PATH=` | The path you will use to access the app (i.e., /netbox, default: none) | +| `-e CSRF_TRUSTED_ORIGINS=` | List of comma-separated, single quoted, trusted origins. Must include protocol, and port if applicable (default: []) | +| `-e REMOTE_AUTH_ENABLED=` | Enable remote authentication (default: False) | +| `-e REMOTE_AUTH_BACKEND=` | Python path to the custom Django authentication backend to use for external user authentication (default: netbox.authentication.RemoteUserBackend) | +| `-e REMOTE_AUTH_HEADER=` | Name of the HTTP header which informs NetBox of the currently authenticated user. (default: HTTP_REMOTE_USER) | +| `-e REMOTE_AUTH_AUTO_CREATE_USER=` | If true, NetBox will automatically create local accounts for users authenticated via a remote service (default: False) | +| `-e REMOTE_AUTH_DEFAULT_GROUPS=` | The list of groups to assign a new user account when created using remote authentication (default: []) | +| `-e REMOTE_AUTH_DEFAULT_PERMISSIONS=` | A mapping of permissions to assign a new user account when created using remote authentication (default: {}) | | `-v /config` | Persistent config files | ## Environment variables from files (Docker secrets) @@ -334,6 +340,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **05.01.26:** - Rebase to Alpine 3.23. Add CSRF_TRUSTED_ORIGINS env settings. Drop support for environments with explicitly disabled IPv6. * **26.08.24:** - Restructure init to allow for plugins as mods. * **16.07.24:** - Add required packages for LDAP support. * **01.06.24:** - Rebase to Alpine 3.20. diff --git a/readme-vars.yml b/readme-vars.yml index 82c8c1c..85cfac8 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -21,7 +21,7 @@ param_usage_include_env: true param_env_vars: - {env_var: "SUPERUSER_EMAIL", env_value: "", desc: "Email address for `admin` account"} - {env_var: "SUPERUSER_PASSWORD", env_value: "", desc: "Password for `admin` account"} - - {env_var: "ALLOWED_HOST", env_value: "", desc: "The hostname you will use to access the app (i.e., netbox.example.com)"} + - {env_var: "ALLOWED_HOST", env_value: "", desc: "The hostname you will use to access the app (e.g., netbox.example.com)"} - {env_var: "DB_NAME", env_value: "", desc: "Database name (default: netbox)"} - {env_var: "DB_USER", env_value: "", desc: "Database user"} - {env_var: "DB_PASSWORD", env_value: "", desc: "Database password"} @@ -29,18 +29,20 @@ param_env_vars: - {env_var: "DB_PORT", env_value: "", desc: "Database port (default: 5432)"} - {env_var: "REDIS_HOST", env_value: "", desc: "Redis host (default: redis)"} - {env_var: "REDIS_PORT", env_value: "", desc: "Redis port number (default: 6379)"} + - {env_var: "REDIS_USERNAME", env_value: "", desc: "Redis username (default: none)"} - {env_var: "REDIS_PASSWORD", env_value: "", desc: "Redis password (default: none)"} - {env_var: "REDIS_DB_TASK", env_value: "", desc: "Redis database ID for tasks (default: 0)"} - {env_var: "REDIS_DB_CACHE", env_value: "", desc: "Redis database ID for caching (default: 1)"} opt_param_usage_include_env: true opt_param_env_vars: - - {env_var: "BASE_PATH", env_value: "", desc: "The path you will use to access the app (i.e., /netbox, optional, default: none)"} - - {env_var: "REMOTE_AUTH_ENABLED", env_value: "", desc: "Enable remote authentication (optional, default: False)"} - - {env_var: "REMOTE_AUTH_BACKEND", env_value: "", desc: "Python path to the custom Django authentication backend to use for external user authentication (optional, default: netbox.authentication.RemoteUserBackend)"} - - {env_var: "REMOTE_AUTH_HEADER", env_value: "", desc: "Name of the HTTP header which informs NetBox of the currently authenticated user. (optional, default: HTTP_REMOTE_USER)"} - - {env_var: "REMOTE_AUTH_AUTO_CREATE_USER", env_value: "", desc: "If true, NetBox will automatically create local accounts for users authenticated via a remote service (optional, default: False)"} - - {env_var: "REMOTE_AUTH_DEFAULT_GROUPS", env_value: "", desc: "The list of groups to assign a new user account when created using remote authentication (optional, default: [])"} - - {env_var: "REMOTE_AUTH_DEFAULT_PERMISSIONS", env_value: "", desc: "A mapping of permissions to assign a new user account when created using remote authentication (optional, default: {})"} + - {env_var: "BASE_PATH", env_value: "", desc: "The path you will use to access the app (i.e., /netbox, default: none)"} + - {env_var: "CSRF_TRUSTED_ORIGINS", env_value: "", desc: "List of comma-separated, single quoted, trusted origins. Must include protocol, and port if applicable (default: [])"} + - {env_var: "REMOTE_AUTH_ENABLED", env_value: "", desc: "Enable remote authentication (default: False)"} + - {env_var: "REMOTE_AUTH_BACKEND", env_value: "", desc: "Python path to the custom Django authentication backend to use for external user authentication (default: netbox.authentication.RemoteUserBackend)"} + - {env_var: "REMOTE_AUTH_HEADER", env_value: "", desc: "Name of the HTTP header which informs NetBox of the currently authenticated user. (default: HTTP_REMOTE_USER)"} + - {env_var: "REMOTE_AUTH_AUTO_CREATE_USER", env_value: "", desc: "If true, NetBox will automatically create local accounts for users authenticated via a remote service (default: False)"} + - {env_var: "REMOTE_AUTH_DEFAULT_GROUPS", env_value: "", desc: "The list of groups to assign a new user account when created using remote authentication (default: [])"} + - {env_var: "REMOTE_AUTH_DEFAULT_PERMISSIONS", env_value: "", desc: "A mapping of permissions to assign a new user account when created using remote authentication (default: {})"} param_usage_include_ports: true param_ports: - {external_port: "8000", internal_port: "8000", port_desc: "will map the container's port 8000 to port 8000 on the host"} @@ -99,6 +101,7 @@ init_diagram: | "netbox:latest" <- Base Images # changelog changelogs: + - {date: "05.01.26:", desc: "Rebase to Alpine 3.23. Add CSRF_TRUSTED_ORIGINS env settings. Drop support for environments with explicitly disabled IPv6."} - {date: "26.08.24:", desc: "Restructure init to allow for plugins as mods."} - {date: "16.07.24:", desc: "Add required packages for LDAP support."} - {date: "01.06.24:", desc: "Rebase to Alpine 3.20."} diff --git a/root/defaults/configuration.py b/root/defaults/configuration.py index e20892f..54d30b5 100644 --- a/root/defaults/configuration.py +++ b/root/defaults/configuration.py @@ -12,13 +12,15 @@ ALLOWED_HOSTS = ['{{ALLOWED_HOST}}'] # PostgreSQL database configuration. See the Django documentation for a complete list of available parameters: # https://docs.djangoproject.com/en/stable/ref/settings/#databases -DATABASE = { - 'NAME': '{{DB_NAME}}', # Database name - 'USER': '{{DB_USER}}', # PostgreSQL username - 'PASSWORD': '{{DB_PASSWORD}}', # PostgreSQL password - 'HOST': '{{DB_HOST}}', # Database server - 'PORT': '{{DB_PORT}}', # Database port (leave blank for default) - 'CONN_MAX_AGE': 300, # Max database connection age +DATABASES = { + 'default': { + 'NAME': '{{DB_NAME}}', # Database name + 'USER': '{{DB_USER}}', # PostgreSQL username + 'PASSWORD': '{{DB_PASSWORD}}', # PostgreSQL password + 'HOST': '{{DB_HOST}}', # Database server + 'PORT': '{{DB_PORT}}', # Database port (leave blank for default) + 'CONN_MAX_AGE': 300, # Max database connection age + }, } # Redis database settings. Redis is used for caching and for queuing background tasks such as webhook events. A separate @@ -31,6 +33,7 @@ REDIS = { # Comment out `HOST` and `PORT` lines and uncomment the following if using Redis Sentinel # 'SENTINELS': [('mysentinel.redis.example.com', 6379)], # 'SENTINEL_SERVICE': 'netbox', + 'USERNAME': '{{REDIS_USERNAME}}', 'PASSWORD': '{{REDIS_PASSWORD}}', 'DATABASE': {{REDIS_DB_TASK}}, 'SSL': False, @@ -44,6 +47,7 @@ REDIS = { # Comment out `HOST` and `PORT` lines and uncomment the following if using Redis Sentinel # 'SENTINELS': [('mysentinel.redis.example.com', 6379)], # 'SENTINEL_SERVICE': 'netbox', + 'USERNAME': '{{REDIS_USERNAME}}', 'PASSWORD': '{{REDIS_PASSWORD}}', 'DATABASE': {{REDIS_DB_CACHE}}, 'SSL': False, @@ -103,6 +107,10 @@ CORS_ORIGIN_REGEX_WHITELIST = [ # r'^(https?://)?(\w+\.)?example\.com$', ] +CSRF_TRUSTED_ORIGINS = [ + {{CSRF_TRUSTED_ORIGINS}} +] + # Specify any custom validators here, as a mapping of model to a list of validators classes. Validators should be # instances of or inherit from CustomValidator. # from extras.validators import CustomValidator diff --git a/root/defaults/uwsgi.ini b/root/defaults/uwsgi.ini index 0795fb6..1dfc844 100644 --- a/root/defaults/uwsgi.ini +++ b/root/defaults/uwsgi.ini @@ -1,5 +1,5 @@ [uwsgi] -http-socket = :8000 +http-socket = [::]:8000 buffer-size = 32768 enable-threads plugin = python3 diff --git a/root/etc/s6-overlay/s6-rc.d/init-netbox-config/run b/root/etc/s6-overlay/s6-rc.d/init-netbox-config/run index a201cfe..614453a 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-netbox-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-netbox-config/run @@ -8,6 +8,7 @@ mkdir -p \ declare -A NETBOX_CONF NETBOX_CONF[ALLOWED_HOST]=${ALLOWED_HOST:-netbox.example.com} NETBOX_CONF[BASE_PATH]=${BASE_PATH:-} +NETBOX_CONF[CSRF_TRUSTED_ORIGINS]=${CSRF_TRUSTED_ORIGINS:-} NETBOX_CONF[DB_NAME]=${DB_NAME:-netbox} NETBOX_CONF[DB_USER]=${DB_USER:-root} NETBOX_CONF[DB_PASSWORD]=${DB_PASSWORD:-} @@ -15,6 +16,7 @@ NETBOX_CONF[DB_HOST]=${DB_HOST:-postgres} NETBOX_CONF[DB_PORT]=${DB_PORT:-} NETBOX_CONF[REDIS_HOST]=${REDIS_HOST:-redis} NETBOX_CONF[REDIS_PORT]=${REDIS_PORT:-6379} +NETBOX_CONF[REDIS_USERNAME]=${REDIS_USERNAME:-} NETBOX_CONF[REDIS_PASSWORD]=${REDIS_PASSWORD:-} NETBOX_CONF[REDIS_DB_TASK]=${REDIS_DB_TASK:-0} NETBOX_CONF[REDIS_DB_CACHE]=${REDIS_DB_CACHE:-1} @@ -38,7 +40,7 @@ if [[ ! -f "/config/configuration.py" ]]; then done fi -if [[ ! -e "/config/media" ]]; then +if [[ ! -e "/config/media" ]] && [[ -e "/app/netbox/netbox/media" ]]; then mv /app/netbox/netbox/media /config/media fi diff --git a/root/etc/s6-overlay/s6-rc.d/svc-netbox-prepare/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/init-netbox-prepare/dependencies.d/init-mods-end similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/svc-netbox-prepare/dependencies.d/init-services rename to root/etc/s6-overlay/s6-rc.d/init-netbox-prepare/dependencies.d/init-mods-end diff --git a/root/etc/s6-overlay/s6-rc.d/svc-netbox-prepare/run b/root/etc/s6-overlay/s6-rc.d/init-netbox-prepare/run similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/svc-netbox-prepare/run rename to root/etc/s6-overlay/s6-rc.d/init-netbox-prepare/run diff --git a/root/etc/s6-overlay/s6-rc.d/svc-netbox-prepare/type b/root/etc/s6-overlay/s6-rc.d/init-netbox-prepare/type similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/svc-netbox-prepare/type rename to root/etc/s6-overlay/s6-rc.d/init-netbox-prepare/type diff --git a/root/etc/s6-overlay/s6-rc.d/init-netbox-prepare/up b/root/etc/s6-overlay/s6-rc.d/init-netbox-prepare/up new file mode 100644 index 0000000..19f800f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-netbox-prepare/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-netbox-prepare/run diff --git a/root/etc/s6-overlay/s6-rc.d/svc-netbox-prepare/up b/root/etc/s6-overlay/s6-rc.d/svc-netbox-prepare/up deleted file mode 100644 index c716644..0000000 --- a/root/etc/s6-overlay/s6-rc.d/svc-netbox-prepare/up +++ /dev/null @@ -1 +0,0 @@ -/etc/s6-overlay/s6-rc.d/svc-netbox-prepare/run diff --git a/root/etc/s6-overlay/s6-rc.d/svc-netbox/data/check b/root/etc/s6-overlay/s6-rc.d/svc-netbox/data/check new file mode 100755 index 0000000..1a9a95c --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-netbox/data/check @@ -0,0 +1,8 @@ +#!/usr/bin/with-contenv bash +# shellcheck shell=bash + +if [[ $(curl -Lo /dev/null -H "Host: ${ALLOWED_HOST}" -s -w "%{http_code}\n" http://localhost:8000) = "200" ]]; then + exit 0 +else + exit 1 +fi diff --git a/root/etc/s6-overlay/s6-rc.d/svc-netbox/dependencies.d/svc-netbox-prepare b/root/etc/s6-overlay/s6-rc.d/svc-netbox/dependencies.d/init-netbox-prepare similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/svc-netbox/dependencies.d/svc-netbox-prepare rename to root/etc/s6-overlay/s6-rc.d/svc-netbox/dependencies.d/init-netbox-prepare diff --git a/root/etc/s6-overlay/s6-rc.d/svc-netbox/run b/root/etc/s6-overlay/s6-rc.d/svc-netbox/run index 805d92b..e799595 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-netbox/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-netbox/run @@ -2,5 +2,5 @@ # shellcheck shell=bash exec \ - s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8000" \ + s6-notifyoncheck -d -n 30 -w 5000 \ cd /app/netbox/netbox s6-setuidgid abc /usr/sbin/uwsgi uwsgi.ini diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-netbox-prepare b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-netbox-prepare similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-netbox-prepare rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-netbox-prepare