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
79f0b997f3
Merge pull request #332 from tobiasge/image-deps
...
Update images in docker-compose
2020-09-01 14:04:21 +02:00
32cef1dcf8
Enable test on Python 3.9
2020-09-01 13:52:01 +02:00
74833a9b21
Update images in docker-compose
2020-09-01 13:34:42 +02:00
a68f315acb
Move default source image to Python 3.8
2020-09-01 12:27:39 +02:00
00022e7d79
Merge pull request #331 from netbox-community/develop
...
Develop
2020-09-01 11:05:25 +02:00
dd490605ca
Preparation for 0.25.0
2020-09-01 10:40:16 +02:00
e2711ca205
Merge pull request #326 from tobiasge/fix-startup-2.9
...
Fixes for Netbox 2.9
2020-09-01 10:37:37 +02:00
a87f2b3331
Merge pull request #329 from tdorsey/patch-1
...
Fix typo in Readme
2020-08-31 08:03:33 +02:00
f174749f98
chore: fix typo
2020-08-30 22:06:20 -04:00
b02a93904e
Fixed IP address creation for Netbox 2.9
2020-08-24 14:20:35 +02:00
3ace32dfc2
Fixed creation of passwords for Netbox 2.9
2020-08-24 11:08:28 +02:00
9fae2b0f74
Fixed VM interface creation for Netbox 2.9
2020-08-24 11:08:23 +02:00
23c3240863
Merge pull request #319 from jamiereid/release
...
Update README.md
2020-07-14 09:09:20 +02:00
3f9e874d77
Update README.md
...
fix spelling mistake
2020-07-14 11:19:49 +10:00
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
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
df72d6bbb5
Handle primary IPs on devices and VMs
2020-06-05 13:12:27 +02:00
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
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
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
ccad15ecf7
Don't try to run non-python files
2020-06-02 13:37:57 +02:00
e9a9d9b70b
Merge pull request #305 from netbox-community/develop
...
Preparation for 0.24.1
2020-05-29 14:41:15 +02:00
03b36058cd
Preparation for 0.24.1
2020-05-29 10:09:08 +02:00
9e06a38d41
Merge pull request #304 from tobiasge/fix-303
...
Fix #303 for Netbox v2.8.5
2020-05-29 10:03:22 +02:00
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
a9232e4f30
Add optional primary_ip on virtual machines initializer
2020-05-22 17:40:11 +02:00
93a3784295
Merge pull request #296 from netbox-community/develop
...
Release 0.24.0
2020-05-16 18:56:06 +02:00
45f7823a17
Preparation for 0.24.0
2020-05-15 13:59:45 +02:00
a6584d2874
Merge pull request #274 from tobiasge/optimise-builds
...
Optimise builds
2020-05-15 13:57:43 +02:00
fd87c7cb98
Merge pull request #294 from netbox-community/Fix284
...
Fix #284 : Fixes the bug that initializers with no data stopped the execution of the later initializers
2020-05-15 13:57:23 +02:00
1f38ca0a86
Merge pull request #295 from minitriga/#293_ssl_tls_env
...
Implement SSL and TLS Config
2020-05-15 09:29:02 +02:00
efec435ba0
fix some issues
2020-05-14 15:37:47 +00:00
ab8ff04852
#293
2020-05-14 15:09:25 +00:00
77feec30a0
Don't stop when startup_scripts quit
...
Fixes #284
2020-05-14 16:59:30 +02:00
bed40b0d05
Add STARTTLS option. ( #277 )
...
* Add STARTTLS option.
2020-05-14 16:41:42 +02:00
24f0545bc6
Merge branch 'ryanmerolle-develop' into develop
2020-05-14 16:20:07 +02:00
1bc1ab2a0a
Preserve compatibility
2020-05-14 16:19:38 +02:00
bfa69dc0e9
Merge branch 'develop' of https://github.com/ryanmerolle/netbox-docker into ryanmerolle-develop
2020-05-14 16:17:59 +02:00
6c8042b63d
Merge pull request #289 from weisdd/bugfix/devices.py.example
...
Fixes #246 : Non-working devices.py.example
2020-05-14 15:35:34 +02:00
795e82be46
Fix shellcheck error
2020-05-14 13:54:40 +02:00
d8a6c321a1
Update build.sh
...
Include suggestion from cimnine
Co-authored-by: Christian Mäder <cimnine@users.noreply.github.com>
2020-05-14 13:49:19 +02:00
1ecf4853b8
Fixed devices.py.example report
2020-05-11 16:46:10 +03:00
5cb8e97e65
Merge pull request #276 from weisdd/bugfix/dockerfile-media-permissions
...
Dockerfile: Fixed file permissions for media
2020-05-06 18:40:00 +02:00
98e131fa30
Merge pull request #279 from hoanhan101/release
...
Fix typo in overriding docker-compose config
2020-04-22 22:51:44 +02:00
d6323ce40f
Fix typo in overriding docker-compose config
2020-04-22 16:24:34 -04:00
1c65f7af10
Dockerfile: Fixed file permissions for media
2020-04-18 17:08:42 +03:00
7fb78b3fd2
Fixed script in case no branch for next exists
...
Build now prints a message when no devlop-* branch is found instead of crashing
2020-04-13 21:44:18 +02:00
aa9f01a778
Merge pull request #273 from cimnine/NoResponse
...
No response
2020-04-09 21:17:42 +02:00
786f9b50d2
Fixes build when DOCKER_FROM is set but empty
...
The DOCKER_FROM is set to an empty value in the push tests.
This expands the check to catch this test case
2020-04-09 10:26:21 +02:00
Tobias Genannt
Tobias Genannt
tdorsey
Christian Mäder
Jamie Reid
John G
Aurélien Dunand
Christian Mäder
Alexander GITTINGS
mbchristoff
ibeljakov
Hoanh An