matthew/netbox-docker
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
1,244 Commits 2 Branches 66 Tags 1.7 MiB
064b713489
Commit Graph

1244 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Christian Mäder
fd3d3d11d1 Tiny refactoring 2020-10-20 20:46:43 +02:00
Christian Mäder
121c3f800d Merge branch 'eemil-develop' into develop 2020-10-20 19:23:11 +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
Christian Mäder
51331621ab
Merge pull request #345 from netbox-community/enable_sponsoring 
Enable Sponsoring Button
 2020-10-19 17:13:34 +02:00
Christian Mäder
156681f68d
Merge pull request #327 from madnutter56/mirror_ldap_groups 
add option to mirror ldap groups into netbox
 2020-10-19 17:06:51 +02: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
Christian Mäder
cad803ed31
Create FUNDING.yml to enable sponsoring 2020-10-19 16:50:04 +02:00
Christian Mäder
9efaccadf7 Merge branch 'Tassatux-develop' into develop 2020-10-18 11:41:03 +02:00
Christian Mäder
f553d17655 Change log message 2020-10-18 11:31:48 +02:00
Christian Mäder
2b361c4541 Merge branch 'develop' of https://github.com/Tassatux/netbox-docker into Tassatux-develop 2020-10-18 11:24:51 +02:00
Christian Mäder
c744603a85
Merge pull request #336 from ericgeldmacher/develop 
Fix sites.yml initializer
 2020-09-21 21:04:39 +02:00
Eric Geldmacher
1133ef50de Fix sites.yml initializer 2020-09-15 15:38:24 -05:00
Tobias Genannt
b33a509e25
Merge pull request #333 from tobiasge/python-3.8 
Move default source image to Python 3.8
 2020-09-01 15:35:17 +02:00
Tobias Genannt
79f0b997f3
Merge pull request #332 from tobiasge/image-deps 
Update images in docker-compose
 2020-09-01 14:04:21 +02:00
Tobias Genannt
32cef1dcf8
Enable test on Python 3.9 2020-09-01 13:52:01 +02:00
Tobias Genannt
74833a9b21 Update images in docker-compose 2020-09-01 13:34:42 +02:00
Tobias Genannt
a68f315acb Move default source image to Python 3.8 2020-09-01 12:27:39 +02:00
Tobias Genannt
00022e7d79
Merge pull request #331 from netbox-community/develop 
Develop
 2020-09-01 11:05:25 +02:00
Tobias Genannt
dd490605ca Preparation for 0.25.0 2020-09-01 10:40:16 +02:00
Tobias Genannt
e2711ca205
Merge pull request #326 from tobiasge/fix-startup-2.9 
Fixes for Netbox 2.9
 2020-09-01 10:37:37 +02:00
Tobias Genannt
a87f2b3331
Merge pull request #329 from tdorsey/patch-1 
Fix typo in Readme
 2020-08-31 08:03:33 +02:00
tdorsey
f174749f98
chore: fix typo 2020-08-30 22:06:20 -04:00
Tobias Genannt
b02a93904e Fixed IP address creation for Netbox 2.9 2020-08-24 14:20:35 +02:00
Tobias Genannt
3ace32dfc2 Fixed creation of passwords for Netbox 2.9 2020-08-24 11:08:28 +02:00
Tobias Genannt
9fae2b0f74 Fixed VM interface creation for Netbox 2.9 2020-08-24 11:08:23 +02:00
Christian Mäder
23c3240863
Merge pull request #319 from jamiereid/release 
Update README.md
 2020-07-14 09:09:20 +02:00
Jamie Reid
3f9e874d77
Update README.md 
fix spelling mistake
 2020-07-14 11:19:49 +10:00
Christian Mäder
4b0f158852
Merge pull request #313 from jgcasd/jgcasd-patch-1 
Add optional LOGIN_TIMEOUT to configuration.py
 2020-06-17 15:26:16 +02: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
Aurélien Dunand
df72d6bbb5 Handle primary IPs on devices and VMs 2020-06-05 13:12:27 +02:00
Christian Mäder
688672de26
Merge pull request #308 from netbox-community/XForwardedProto 
Remove the 'X-Forwarded-Proto' line from the nginx config
 2020-06-05 11:57:23 +02:00
Christian Mäder
5624ecc65e Remove the 'X-Forwarded-Proto' line from the nginx config 
The reason is that in the default configuration nginx is only serving 'http' traffic.
So if an upstream proxy sets the 'X-Forwarded-Proto' header, because it is terminating
TLS, then nginx will overwrite it to 'http'. This will cause django to think the page
is served via 'http' and it will not create 'https://...' URLs.

Related to #292
 2020-06-02 16:06:52 +02:00
Christian Mäder
7f93b328af
Merge pull request #307 from netbox-community/FixFileMatching 
Don't try to run non-python files
 2020-06-02 14:42:58 +02:00
Christian Mäder
ccad15ecf7 Don't try to run non-python files 2020-06-02 13:37:57 +02:00
Tobias Genannt
e9a9d9b70b
Merge pull request #305 from netbox-community/develop 
Preparation for 0.24.1
 2020-05-29 14:41:15 +02:00
Tobias Genannt
03b36058cd Preparation for 0.24.1 2020-05-29 10:09:08 +02:00
Tobias Genannt
9e06a38d41
Merge pull request #304 from tobiasge/fix-303 
Fix #303 for Netbox v2.8.5
 2020-05-29 10:03:22 +02:00
Tobias Genannt
b7ad18afb0 Fix #303 for Netbox v2.8.5 
In this Netbox version the ColorChoices where moved to utilities.choiceFix #303 for Netbox v2.8.5

In this Netbox version the ColorChoices where moved to utilities.choicess
 2020-05-27 09:10:24 +02:00