Commit Graph

378 Commits

Author SHA1 Message Date
Aleksandar Radunovic 97477556e0 Increase order prefix to 3 digits 2018-10-16 13:26:13 +02:00
Aleksandar Radunovic 7e6edd1bf5 Merge branch 'master' into add-more-seeds 2018-10-16 11:32:41 +02:00
Aleksandar Radunovic b53e886f8f Handle all associations 2018-10-16 11:05:28 +02:00
nine.ch Bot 63062a2634 Bump VERSION file 2018-10-16 00:38:22 -07:00
Christian Mäder 2b628b9826
Merge pull request #103 from ninech/permissions
Add permissions to user/group initializers
2018-10-16 09:37:41 +02:00
Aleksandar Radunovic 6cc4c67387 Remove default pop value 2018-10-16 09:12:43 +02:00
Aleksandar Radunovic ab0ce20971 Update README 2018-10-15 15:15:56 +02:00
Aleksandar Radunovic 90ae5cf01d Add device seeds 2018-10-15 15:15:41 +02:00
Aleksandar Radunovic ebb7779b5f Add device role seeds 2018-10-15 15:15:23 +02:00
Aleksandar Radunovic 60f7de1898 Add rack seeds 2018-10-15 15:15:09 +02:00
Aleksandar Radunovic 89fddbe0ab Add rack role seeds 2018-10-15 15:14:42 +02:00
Aleksandar Radunovic a2b08a6ca5 Add device type seeds 2018-10-15 15:14:27 +02:00
Aleksandar Radunovic 86675278ab Add manufacturer seeds 2018-10-15 15:14:11 +02:00
Aleksandar Radunovic 791027f77b Add site seeds 2018-10-15 15:13:51 +02:00
Aleksandar Radunovic 819f325bd5 Add region seeds 2018-10-15 15:13:26 +02:00
Christian Mäder 4053a714f8 Add permissions to user/group initializers
Thank you @bdlamprecht for researching how to add permissions to
users and groups in #92.

Fixes #92
2018-10-13 17:44:01 +02:00
Christian Mäder f1ebd4d246
Merge pull request #101 from ninech/cimnine-ntc-slack
Mention new Network-To-Code #netbox-docker Slack channel
2018-09-27 09:58:52 +02:00
Christian Mäder 68e6a62df1
Update README.md 2018-09-27 09:44:14 +02:00
Christian Mäder 81f8c7386d
✏️ Listed one more breaking change 2018-09-14 10:36:09 +02:00
nine.ch Bot ec1a253bde Bump VERSION file 2018-09-14 01:34:06 -07:00
Christian Mäder bd1c58c91e
✏️ Mention update to Alpine 3.8 2018-09-14 10:21:26 +02:00
Christian Mäder 05070b3f9f
Merge pull request #99 from ScanPlusGmbH/update-alpine
Update Alpine
2018-09-14 10:19:08 +02:00
Tobias Genannt ab72ba10c2 Update Alpine
This updates to the newest stable version (Alpine 3.8)
2018-09-14 09:43:09 +02:00
Christian Mäder 4c6ba58ef5
Merge pull request #98 from ninech/issues_96
🐞 REDIS_PORT should be int
2018-09-14 09:31:04 +02:00
Christian Mäder 6d74443f21
🐞 REDIS_PORT should be int
Closes #96
2018-09-14 08:50:13 +02:00
Christian Mäder 61414b7be7
Merge branch 'bdlamprecht-moving_env_files' 2018-09-14 08:49:27 +02:00
Brady Lamprecht d8285b05f2 Moving env files into separate directory for better organization 2018-09-05 15:37:28 -06:00
Christian Mäder 968bb9f10f
Prevent Github API Rate Limits
When building netbox-docker on Travis, it happened too often that the
build failed because of Github's API rate limits. These apply for all
requests, but if the request is unauthenticated they are applied by IP.

This is bad for netbox-docker, as we build on Travis where the build-
workers are shared with the rest of the world.

This commit adds the possibility to define OAuth credentials as
documented at [1]. Hopefully this leads to more reliable releases of
netbox-docker images.

[1] https://developer.github.com/v3/#increasing-the-unauthenticated-rate-limit-for-oauth-applications
2018-08-28 09:21:08 -07:00
Christian Mäder aafa6483dc
fix wrong version increment 2018-08-16 08:19:49 -07:00
nine.ch Bot 38ea286111 Bump VERSION file 2018-08-16 17:17:37 +02:00
Christian Mäder be0ce47bc6
Merge pull request #91 from ninech/webhooks-backend
Webhooks Backend (based on #90)
2018-08-16 08:02:57 -07:00
Christian Mäder 2b3f831749
Don't lock Django to explicit version
... but rather use the same definition that is currently used in
Netbox's `requirements.txt`.
2018-08-14 10:08:34 -07:00
Christian Mäder fb22a19893
✏️ Added nginx troubleshooting section 2018-08-13 15:37:06 -07:00
Christian Mäder fdefa3465d
🆙 Update nginx to the latest version 2018-08-13 15:30:43 -07:00
Christian Mäder 645ec1281c
Use a default Redis password
Although it does not provide any additional security, it shows how to
configure Redis with a password and how to use Netbox using a password
protected redis server. Something that might be considered in a classic
production deployment. (But is mostly irrelevant in e.g. a Kubernetes /
OpenShift deployment as the isolation is usually on a network level.)
2018-08-13 15:19:29 -07: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
nine.ch Bot 6b5a4cf1db Bump VERSION file 2018-08-09 00:35:28 +02:00
Christian Mäder f1a78d1b9c
⚙️ Don't build webhook branch anymore
Because it's merged into Netbox since 2.4.
2018-08-08 15:33:35 -07:00
Demian 61dd958af4
Merge pull request #86 from hex2a/patch-1
docker-compose: use latest postgres minor version (10.4)
2018-08-05 14:18:04 +02:00
Demian fcf01432ed
Merge branch 'master' into patch-1 2018-08-05 12:42:58 +02:00
Demian 7b6842fca3
Merge pull request #83 from GnomeZworc/master
Add auth-ldap-user-dn-template in ldap_config.py
2018-08-05 12:42:34 +02:00
Demian 2aaf1ec18d
Merge branch 'master' into master 2018-08-05 12:20:01 +02:00
Demian 4fee1e3bf3
Merge pull request #85 from sts/patch-1
Update docker-entrypoint.sh
2018-08-05 12:17:05 +02:00
Demian c4b51e4006
Merge branch 'master' into master 2018-08-05 12:13:02 +02:00
hex2a b544fa5e4f
docker-compose: use latest postgres minor version (10.4) 2018-07-28 18:22:55 +02:00
Stefan Schlesinger cb37e3ba92
Update docker-entrypoint.sh
Make netbox-docker function with  v2.4-beta1 again, fixes #84.

> The shell --plain option is deprecated in favor of -i python or --interface python.
> The shell --interface option now accepts python to force use of the “plain” Python interpreter.
https://docs.djangoproject.com/en/2.0/releases/1.10/#deprecated-features-1-10
2018-07-24 10:56:46 +02:00
Nicolas Boufidjeline 9d1a602f71
Update ldap_config.py 2018-07-20 12:24:17 +02:00