Commit Graph

154 Commits

Author SHA1 Message Date
Grokzen 170bf4e03d Remove unused variable 2018-05-18 21:24:31 +02:00
Grokzen 187c349fde Add support for auto_weight counter on choices when loading selection field from custom_fields.yml
This also fixes a bug when using the same value for 2 different custom fields breaks becuase it tries to
create a new CustomFieldChoice object instead of reusing the one that already exists.
2018-05-18 21:17:21 +02:00
Christian Mäder 19805a4312
Merge pull request #64 from hikhvar/dont-print-credentials
Do not print the admin credentials on container startup.
2018-04-19 12:28:56 +02:00
Christoph Petrausch 2579036b0a Fixed missing " 2018-04-19 11:55:41 +02:00
Christoph Petrausch f124417f69 Added username and email of superuser 2018-04-19 11:53:55 +02:00
Christoph Petrausch d9b9a8adda Do not print the admin credentials. All outputs from STDOUT may end up in a central log store. This will compromise the superuser credentials. 2018-04-18 13:39:54 +02:00
Christian Mäder c231aa97a1
Merge pull request #62 from mtwstudios/patch-1
set MEDIA_ROOT to match docker-compose.yml
2018-04-10 13:55:00 +02:00
Christian Mäder 38f3ca8848
Merge branch 'master' into patch-1 2018-04-10 13:53:07 +02:00
Christian Mäder a5dccb2558
Revert "⚙️ Print every command"
This reverts commit 1fb6b80f93.
2018-04-10 11:42:06 +02:00
Christian Mäder 1fb6b80f93
⚙️ Print every command 2018-04-10 11:13:52 +02:00
Christian Mäder 6c3966415b
⚙️ Additional build debug info 2018-04-10 10:58:31 +02:00
Christian Mäder 626195d00f
⚙️ Parallel builds 2018-04-10 10:37:27 +02:00
Christian Mäder 8ffe6529c9
⚙️ Reduce number of branches to build 2018-04-10 10:13:53 +02:00
Matthew Tom-Wolverton b28e615023
set MEDIA_ROOT to match docker-compose.yml
otherwise the default of `/etc/netbox/media` is used, which doesn't persist
2018-04-08 19:46:26 -04:00
Christian Mäder 4bd5f0903f
🐞 Fix building all branches 2018-04-06 11:16:29 +02:00
Christian Mäder 6945157e86
Merge pull request #59 from mchlumsky/proxy_support
Add proxy support to build.sh
2018-04-05 16:40:38 +02:00
Martin Chlumsky 2bbb7f68f2 Add proxy support to build.sh. 2018-04-05 10:25:27 -04:00
Christian Mäder 75fdcfdeb7
Merge pull request #61 from ScanPlusGmbH/fix-typo
Fix typo
2018-04-04 15:32:00 +02:00
Tobias Genannt add2a04ae6 Fix typo 2018-04-04 13:13:41 +02:00
Christian Mäder 1a78a881aa
Merge branch 'ScanPlusGmbH-issue-54' 2018-04-04 10:17:57 +02:00
Christian Mäder 726efd1128
⬆️ Version increment
Because of a braking change.
2018-04-04 10:17:33 +02:00
Tobias Genannt b46bd58e0a
Move config to /etc/netbox/config (Fixes #54)
With this the configuration is moved to /etc/netbox/config and the
default reports directory is set to /etc/netbox/reports. This enables
the user to mount reports from a config map or persistent volume in
OpenShift.
2018-04-04 10:13:30 +02:00
Christian Mäder 5b62a4c0ad
Merge pull request #60 from ninech/preparing_for_braking_changes
 Introduces a Netbox Docker project version
2018-04-04 10:11:48 +02:00
Christian Mäder 0b55a24188
✏️ Version ≠ Version 2018-04-04 09:50:17 +02:00
Christian Mäder f56a79381b
Introduces a Netbox Docker project version 2018-04-04 09:44:58 +02:00
Christian Mäder 6074fd873a
Merge pull request #57 from ninech/correct_types_in_config
🐞 Parse config correctly
2018-03-28 15:21:43 +02:00
Christian Mäder fc5e008bb7
🐞 Parse config correctly
Fixes #56
2018-03-26 11:08:09 +02:00
Christian Mäder ac41f7ed78
Merge branch 'bdlamprecht-adding_napalm' 2018-03-08 09:56:14 +01:00
Christian Mäder f0496539b6
✏️ Moved NAPALM section
... and rephrased it a bit.
2018-03-08 09:55:56 +01:00
Christian Mäder 578bb38770
✏️ Moved ldap info into Version section 2018-03-08 09:54:34 +01:00
Christian Mäder 2d5a84e023
✏️ Made production instructions more prominent 2018-03-08 09:54:06 +01:00
Christian Mäder a59c48427f
✏️ Netbox -> NetBox 2018-03-08 09:52:35 +01:00
Brady Lamprecht 4897e0ef0e
Updating README.md to describe NAPALM settings. 2018-03-08 09:38:43 +01:00
Brady Lamprecht 07b1b4675c
Adding in support for NAPALM 2018-03-08 09:38:43 +01:00
Christian Mäder df38f74c0e
Merge pull request #53 from ScanPlusGmbH/gunicorn-config
Externalize gunicorn-config
2018-03-08 09:33:20 +01:00
Tobias Genannt 2a1b6e42a8 Externalize gunicorn-config
This moves the gunicorn_config.py into /etc/netbox so that it can be
easily mapped through a Openshift config map
2018-03-07 14:57:56 +01:00
Christian Mäder ae9a3f04a5
✏️ Typo 2018-03-05 16:38:30 +01:00
Christian Mäder 747b32adb2
🐞 Fix parameter passing 2018-03-05 16:29:02 +01:00
Christian Mäder bc786364d9
🐞 Fix error reporting 2018-03-05 16:28:35 +01:00
Christian Mäder 4d16297418
⚙️ Check variant when checking latest version 2018-03-05 15:17:59 +01:00
Christian Mäder b13617aff2
Merge branch 'ScanPlusGmbH-ldap' 2018-03-05 14:38:17 +01:00
Christian Mäder 36f79b3ffe
⚙️ Compact Variants Logic into build-all.sh 2018-03-05 14:36:24 +01:00
Christian Mäder e3120a715e
🐳 Allow variants from other source images 2018-03-05 14:35:11 +01:00
Christian Mäder 30a37511e2
❇️ Adds DEBUG option 2018-03-05 14:32:04 +01:00
Christian Mäder 8f001adef4
💄 Cleanup and hide warnings 2018-03-05 14:29:24 +01:00
Tobias Genannt 6a01a3379d Add django_ldap_auth
In the ldap.Dockerfile the django_ldap_auth module is installed to
enable authentication againt LDAP servers.
2018-02-27 10:09:14 +01:00
Christian Mäder 3af803f481
✏️ OpenShift Issues were resolved
Thanks to #47 Netbox seems not fit for OpenShift as well.
2018-02-22 18:31:25 +01:00
Christian Mäder a0f4fc677e
Merge branch 'ScanPlusGmbH-openshift-config' 2018-02-22 18:05:07 +01:00
Christian Mäder 912357322a
✏️ Cosmetics 2018-02-22 18:04:31 +01:00
Tobias Genannt ef76e4e8ea Modifications for Openshift
With these modifications the netbox containers can run on Openshift.
The configuration files can be imported from a config map to the
'/etc/netbox' directory and will be loaded from there.
2018-02-22 17:22:04 +01:00