matthew/netbox-docker
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop' into saml

Browse Source
This commit is contained in:
Tobias Genannt 2024-05-25 15:21:57 +02:00 committed by GitHub
commit 570bb311e2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configuration/configuration.py
View File

@ -221,9 +221,9 @@ if 'GRAPHQL_ENABLED' in environ:
# authenticated to NetBox indefinitely. # authenticated to NetBox indefinitely.
LOGIN_PERSISTENCE = _environ_get_and_map('LOGIN_PERSISTENCE', 'False', _AS_BOOL) LOGIN_PERSISTENCE = _environ_get_and_map('LOGIN_PERSISTENCE', 'False', _AS_BOOL)
# Setting this to True will permit only authenticated users to access any part of NetBox. By default, anonymous users # When enabled, only authenticated users are permitted to access any part of NetBox.
# are permitted to access most data in NetBox (excluding secrets) but not make any changes. # 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', 'False', _AS_BOOL) LOGIN_REQUIRED = _environ_get_and_map('LOGIN_REQUIRED', 'True', _AS_BOOL)
# The length of time (in seconds) for which a user will remain logged into the web UI before being prompted to # 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]) # re-authenticate. (Default: 1209600 [14 days])

2
docker-compose.yml
View File

@ -8,7 +8,7 @@ services:
env_file: env/netbox.env env_file: env/netbox.env
user: 'unit:root' user: 'unit:root'
healthcheck: healthcheck:
start_period: 60s start_period: 90s
timeout: 3s timeout: 3s
interval: 15s interval: 15s
test: "curl -f http://localhost:8080/login/ || exit 1" test: "curl -f http://localhost:8080/login/ || exit 1"

2
requirements-container.txt
View File

@ -2,4 +2,4 @@ django-auth-ldap==4.8.0
django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.14.3 django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.14.3
dulwich==0.22.1 dulwich==0.22.1
python3-saml==1.16.0 --no-binary lxml,xmlsec python3-saml==1.16.0 --no-binary lxml,xmlsec
sentry-sdk[django]==2.1.1 sentry-sdk[django]==2.3.1

1
test-configuration/test_config.py
View File

@ -4,3 +4,4 @@ LOGGING = {
} }
DEFAULT_PERMISSIONS = {} DEFAULT_PERMISSIONS = {}
LOGIN_REQUIRED = False

2
test.sh
View File

@ -84,7 +84,7 @@ test_netbox_web() {
--retry 5 \ --retry 5 \
--retry-delay 0 \ --retry-delay 0 \
--retry-max-time 40 \ --retry-max-time 40 \
http://127.0.0.1:8000/ http://127.0.0.1:8000/login/
) )
if [ "$RESP_CODE" == "200" ]; then if [ "$RESP_CODE" == "200" ]; then
echo "Webservice running" echo "Webservice running"