Mascali
/
netbox-docker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
786 Commits 2 Branches 56 Tags 1.4 MiB
Commit Graph

786 Commits

Author SHA1 Message Date
Christian Mäder 9d51762161
Merge pull request #359 from devon-mar/login-timeout-fix 
Fix TypeError when using LOGIN_TIMEOUT
 2020-11-13 15:36:16 +01:00
devon-mar 4276c941eb
Change LOGIN_TIMEOUT default to int 
Co-authored-by: Christian Mäder <cimnine@users.noreply.github.com>
 2020-11-03 14:57:12 -08:00
Christian Mäder 3cbdf26773
Merge pull request #356 from timrabl/enviroment-changes 
Enviroment changes
 2020-11-03 18:44:44 +01:00
devon-mar fbfce46ce5 Fix TypeError when using LOGIN_TIMEOUT 2020-11-02 22:39:06 -08:00
Tim Oliver Rabl 255889288c Rename SESSION_FILE_PATH default environment variable in configration.py 2020-10-30 23:06:42 +01:00
Tobias Genannt c068db1751
Merge pull request #348 from tobiasge/python-upgrade 
Upgrade Python image to 3.9-alpine
 2020-10-29 17:12:24 +01:00
Christian Mäder 378784a19c
Merge pull request #328 from pruiz/pruiz/make-ldap-group-settings-optional 
Allow disabling LDAP-group related settings when AUTH_LDAP_*_GROUP environment variables are not defined
 2020-10-29 16:24:17 +01:00
Pablo Ruiz dcb3b5495d Remove now unneeded os. prefix from environ calls. 2020-10-29 14:57:34 +01:00
Pablo Ruiz 60f4e8b2ed Allow disabling LDAP-group related settings when AUTH_LDAP_*_GROUP environment variables are not defined. This is required in order to work with Google's Secure LDAP, due to some limitations on django-auth-ldap plugin (see: https://github.com/django-auth-ldap/django-auth-ldap/issues/201) 2020-10-29 14:56:35 +01:00
Christian Mäder a51ad36801
Merge pull request #355 from netbox-community/develop 
Version 0.26.2
 2020-10-27 16:41:48 +01:00
Christian Mäder 953ee09b0c Preparation for 0.26.2 2020-10-27 16:24:10 +01:00
Christian Mäder 94047d60ed
Merge branch 'release' into develop 2020-10-27 16:22:59 +01:00
Christian Mäder 80bfd98000
Merge pull request #354 from comphilip/release 
Fix ldap configuration in /etc/netbox/config/ldap/*.py not loaded
 2020-10-27 16:11:55 +01:00
comphilip 7694fd320a
use extend method for simplification. 
Co-authored-by: Christian Mäder <cimnine@users.noreply.github.com>
 2020-10-27 21:12:26 +08:00
Christian Mäder 097bea8702
Merge pull request #353 from netbox-community/develop 
Version 0.26.1
 2020-10-27 12:32:43 +01:00
comphilip a3c21ae0ac
Fix ldap configuration in /etc/netbox/config/ldap/*.py not loaded 2020-10-27 19:27:51 +08:00
Christian Mäder 074960327b Preparation for 0.26.1 2020-10-27 10:30:55 +01:00
Christian Mäder e1462d9ca4
Merge pull request #351 from netbox-community/RevertPrometheusPreps 
Revert changes to 'gunicorn_config.py'
 2020-10-27 10:29:07 +01:00
Christian Mäder a5aa1bfd3b Revert changes to 'gunicorn_config.py' 2020-10-27 09:31:47 +01:00
Christian Mäder cb02450783
Merge pull request #350 from comphilip/release 
Fix "'NoneType' object has no attribute 'lower'" when no AUTH_LDAP_MI…
 2020-10-27 09:29:34 +01:00
comphilip 8307560c88
Fix "'NoneType' object has no attribute 'lower'" when no AUTH_LDAP_MIRROR_GROUPS defined 2020-10-27 15:51:12 +08:00
Christian Mäder 43aea3a1dd
Merge pull request #349 from netbox-community/develop 
Version 0.26.0
 2020-10-26 16:55:21 +01:00
Tobias Genannt bb2ac7bd71 Disable tests for Python 3.10-rc 
Some of the dependencies of Netbox can't be built with Python 3.10.
 2020-10-26 16:47:38 +01:00
Tobias Genannt 30a98c5009 Upgrade Python image to 3.9-alpine 
Upgrade the default base image to Python 3.9 and start testing on Python 3.10-rc
 2020-10-26 16:25:38 +01:00
Christian Mäder a52a5547be Preparation for 0.26.0 2020-10-26 16:21:47 +01:00
Tobias Genannt 120a605d35
Merge pull request #347 from tobiasge/python-final 
Use release version of Python 3.9 in tests
 2020-10-26 16:06:12 +01:00
Christian Mäder e51f9cbc18
Merge pull request #344 from netbox-community/Prometheus 
Prepare for Monitoring with Prometheus
 2020-10-26 15:58:52 +01:00
Tobias Genannt 071401b771
Merge pull request #346 from tobiasge/fix-action-warning 
Fix warning in Github Actions
 2020-10-26 15:48:50 +01:00
Tobias Genannt 911488242f Use release version of Python 3.9 in tests 2020-10-26 15:42:31 +01:00
Christian Mäder 5512ea68b3 Ignore prometheus.yml 2020-10-26 15:40:22 +01:00
Christian Mäder 7d055fbcaf Mention monitoring in README 2020-10-26 15:29:41 +01:00
Tobias Genannt 3d244a1946 Fix warning in Github Actions 
Our build script is using "set-env" which has been deprecated by Github.
See this bolg entry:
https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/
 2020-10-26 15:23:17 +01:00
Christian Mäder e18d6c53b3 Revert most changes 2020-10-26 15:22:56 +01:00
Christian Mäder 48decdeb0e Monitoring parts to docker-compose.monitorin.yml 2020-10-26 15:22:56 +01:00
Christian Mäder 6ac65a64c9 Fix test 2020-10-26 15:22:56 +01:00
Christian Mäder f46d8a7782 Adds Prometheus/Grafana monitoring infrastructure 2020-10-26 15:22:52 +01:00
Christian Mäder 64d82b5e42
Merge pull request #343 from netbox-community/DynamicVariables 
Dynamic Configuration
 2020-10-26 15:21:42 +01:00
Christian Mäder 58050e5287 Merge core functionality into `configuration.py` 
Which is the file `docker/configuration.docker.py` in our repo.
The common code is then imported by `docker/ldap_config.docker.py`.
 2020-10-26 14:43:11 +01:00
Christian Mäder 2dba2b8811 Fix default for secret_key in configuration.py 2020-10-20 21:45:37 +02:00
Christian Mäder d0c7b87925 Improve order in configuration.py 2020-10-20 21:40:14 +02:00
Christian Mäder ec3fd8a790 Revert accidential change to _read_secret order 2020-10-20 21:36:40 +02:00
Christian Mäder 75554ef5b4 Consistency in namespace name 2020-10-20 21:29:08 +02:00
Christian Mäder dad0608834 Rename example.py to extra.py 
And add some comments to the the file that hopefully guide the user.
 2020-10-20 20:51:43 +02:00
Christian Mäder dc77f1a0b1 Ignore non-default configuration files 2020-10-20 20:51:43 +02:00
Christian Mäder 16b567939c Dot character has special meaning in module names 
Therefore we esacpe it using the underscore character.
 2020-10-20 20:51:43 +02:00
Christian Mäder 20820e10c2 Optimize Imports in ldap_config.py 2020-10-20 20:51:35 +02:00
Christian Mäder 553c8ea470 Update configuration.py 2020-10-20 20:49:59 +02:00
Christian Mäder 811618b359 Lower gunicorn default loglevel 2020-10-20 20:46:43 +02:00
Christian Mäder 7429835970 Sample dynamic configuration file 2020-10-20 20:46:43 +02:00
Christian Mäder 43c05d816d Dynamically load configuration files 2020-10-20 20:46:43 +02:00