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

59 Commits

Author SHA1 Message Date
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 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 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 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 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
Christian Mäder fd3d3d11d1 Tiny refactoring 2020-10-20 20:46:43 +02:00
Christian Mäder 9287995df4 Update to latest configuration 2020-10-20 19:22:52 +02:00
eemil 85fbb0af70 fix typo 
Co-authored-by: Christian Mäder <cimnine@users.noreply.github.com>
 2020-10-20 19:20:29 +02:00
eemil 6bada6660a Prefer secret to env variable if both are configured 2020-10-20 19:20:29 +02:00
Christian Mäder df3ab69c0f
Merge pull request #310 from shuichiro-makigaki/add-remote-auth 
Add REMOTE_AUTH_* configs
 2020-10-20 09:02:27 +02:00
Shuichiro MAKIGAKI 38f4474b14 Add REMOTE_AUTH_* support 2020-10-20 11:11:32 +09:00
Alex Houlton 9f4a9f528c add option to mirror ldap groups into netbox 
this commit allows ldap assigned groups to be mirrored into
netbox users.

The default is None as this is not the primary way to do this
change.
 2020-10-19 07:50:33 -07:00
John G 51490d0039
Added LOGIN_TIMEOUT option to configuration.py 
Added LOGIN_TIMEOUT option to configuration.py. The option is already available in standard Netbox configuration.
 2020-06-16 11:27:59 -07:00
Christian Mäder 1f38ca0a86
Merge pull request #295 from minitriga/#293_ssl_tls_env 
Implement SSL and TLS Config
 2020-05-15 09:29:02 +02:00
Alexander GITTINGS efec435ba0 fix some issues 2020-05-14 15:37:47 +00:00
Alexander GITTINGS ab8ff04852 #293 2020-05-14 15:09:25 +00:00
mbchristoff bed40b0d05
Add STARTTLS option. (#277) 
* Add STARTTLS option.
 2020-05-14 16:41:42 +02:00
Christian Mäder 1bc1ab2a0a Preserve compatibility 2020-05-14 16:19:38 +02:00
Ryan Merolle 64b763429f
update configuration.py for netbox 2.7.11 REDIS config 
update configuration.py to use REDIS config referencing `tasks` in place of `webhooks`
 2020-04-01 23:41:35 -04:00
nepeat f87ffe7c33
Update configuration/configuration.py 
Co-Authored-By: Christian Mäder <cimnine@users.noreply.github.com>
 2020-03-29 01:40:08 -07:00
erin 8bc77c1bc0 Add RELEASE_CHECK_URL to configuration and default env. 2020-03-27 21:34:51 -07:00
Kevin Newland 74eaae6bc8
Update ldap_config.py 2020-01-28 17:43:35 -06:00
Kevin Newland 00986573d9
Update LDAP Caching Options 
Update LDAP caching configuration to match changes made to django-auth-ldap in 1.6.0

Django social auth now uses different cache configuration options: https://github.com/django-auth-ldap/django-auth-ldap/blob/master/django_auth_ldap/backend.py#L1041-L1056

NetBox settings.py reference: https://github.com/netbox-community/netbox/blob/master/netbox/netbox/settings.py#L360
 2020-01-28 17:36:45 -06:00
Christian Mäder 355f9d4cf7 Prepare for Netbox 2.7 2020-01-20 08:39:26 +01:00
Stefan de Kooter 135199e597
Merge branch 'master' into patch-2 2019-12-09 22:54:30 +01:00
Stefan de Kooter 6568dff8e1
Add SSLMODE to database connection properties 
Defaulting to SSLMODE=prefer, optional override using environment variable: DB_SSLMODE
 2019-11-06 10:26:29 +01:00
Stefan de Kooter 773ec630b4
Add CONN_MAX_AGE to database connection settings 
Defaulting to 300 seconds for the database connection to avoid new connection setup roundtrip on consecutive requests
 2019-11-06 10:24:15 +01:00
Tobias Genannt db04deca0d Add support for custom scripts 
Custom scripts were added to Netbox in version 2.6.3. This adds a new
directory to the image where custom scripts can be placed.
 2019-10-14 09:50:05 +02:00
Christian Mäder 89b9c22252 Merge branch 'patch-1' of https://github.com/miso231/netbox-docker into miso231-patch-1 2019-07-02 21:33:36 +02:00
Christian Mäder dc3db2d9fd %s/digitalocean/netbox-community/gi 
Thank you Digitalocean for sponsoring Netbox!
And thank you for letting it grow up and move out ;)
 2019-07-02 21:32:58 +02:00
Michal Petko 0270fc2dca
Retype REDIS_PORT to int 2019-07-01 17:29:58 +02:00
Christian Mäder aed5126279 Provides necessary changes for v2.6 compatibility 
Fixes #139
 2019-06-21 22:48:23 +02:00
Matthew Yauch 7362e275b0 Add AUTH_LDAP_GROUP_TYPE env variable support 
Dynamically imports the correct class/subclass from django_auth_ldap.config based on the AUTH_LDAP_GROUP_TYPE environment variable.
 2019-05-09 07:47:28 -07:00
Christian Mäder 8f39034014 Merge branch 'mryauch-patch-1' of https://github.com/mryauch/netbox-docker into mryauch-mryauch-patch-1 2019-05-08 11:57:43 +02:00
Matthew Yauch 5107fb7c6b
AUTH_LDAP_BIND_PASSWORD secret file support 2019-04-30 14:24:22 -07:00
Alexander Kinneer 5beb3093db Add support for using SSL connections to Redis. 2019-03-19 11:35:45 -05:00
Christian Mäder 5a09659278
Code style improvements 2019-01-30 13:58:23 +01:00
jacob 2f5d293fd6 ldap_config: resolve AUTH_LDAP_USER_SEARCH_ATTR and AUTH_LDAP_GROUP_SEARCH_CLASS from env 2019-01-19 05:12:36 -05:00
Christian Mäder c9d9c7349e
Remove duplicated entry in `configuration.py` 2019-01-09 09:03:24 +01:00
Christian Mäder 6d74443f21
🐞 REDIS_PORT should be int 
Closes #96
 2018-09-14 08:50:13 +02:00
Christian Mäder 013f81b791
♻️ Make netbox-worker it's own container 
One container should ideally have one responsibility [1]. Therefore I
implemented the netbox-worker to start in it's own container. This is
possible, because netbox and the worker communicate via redis anyway.

They still use the same image underneath, just the "command" they
execute while starting different.

Or in other words: I see no reason to introduce supervisord, when we
already have docker-compose which can take care of running multiple
processes.

Also, here's another benefit: Now it's possible to view the logs of the
webhook worker independently of the other netbox logs (and vice-versa).

Other changes in this commit:
* I don't see a reason to put a password for Redis in the docker-compose
  setup, so I removed it.
* Slightly changed the nginx config, so that the nginx startup command
  becomes simpler and any error should be visible in the docker log.
* Some housekeeping in the `Dockerfile`.
* Added some troubleshooting advice regarding webhooks to the README.

I'd like to thank Brady (@bdlamprecht [2]) here who did the harder
work of figuring out what's even required to have webhooks working. [3]

[1] 
https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#decouple-applications
[2] https://github.com/bdlamprecht
[3] https://github.com/ninech/netbox-docker/pull/90
 2018-08-13 14:04:09 -07:00
Christian Mäder b8885e4b79
✨ Disable webhooks by default* 
*but enable it by default for anyone who checks out the netbox-docker project
via the netbox.env file.
 2018-08-13 13:17:41 -07:00
Christian Mäder bf557877d1
✨ Read redis password like any other secret 2018-08-13 13:16:10 -07:00
Brady Lamprecht b88974ef9f Working implementation of webhooks using new 'redis' container 2018-08-10 17:55:09 -06:00
Demian c4b51e4006
Merge branch 'master' into master 2018-08-05 12:13:02 +02:00
Nicolas Boufidjeline 9d1a602f71
Update ldap_config.py 2018-07-20 12:24:17 +02:00