From 5e5cc13a056ecfd88b1b3479d57d0032c0ce1d2a Mon Sep 17 00:00:00 2001 From: Tobias Genannt Date: Wed, 9 May 2018 09:47:50 +0200 Subject: [PATCH 1/6] Update to Alpine 3.7 Because the tag "python:3.6-alpine" points to Alpine 3.4 which is now end of life (as of 2018-05-01) the image now pulls the Alpine 3.7 python image --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index d4cf167..aece64e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.6-alpine +FROM python:3.6-alpine3.7 RUN apk add --no-cache \ bash \ @@ -12,7 +12,6 @@ RUN apk add --no-cache \ libxml2-dev \ libxslt-dev \ openldap-dev \ - openssl-dev \ postgresql-dev \ wget From cdbfdaf361a5231df7524062bd0834cdbbd95e52 Mon Sep 17 00:00:00 2001 From: Grokzen Date: Wed, 18 Apr 2018 19:04:29 +0200 Subject: [PATCH 2/6] Implement fix for field 'filterable' that was broken. Added new custom field parameter 'filter_logic' --- README.md | 2 +- initializers/custom_fields.yml | 11 +++++------ startup_scripts/20_custom_fields.py | 7 +++++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index fcb86a1..a312dc6 100644 --- a/README.md +++ b/README.md @@ -168,7 +168,7 @@ text_field: label: Custom Text description: Enter text in a text field. required: false - filterable: true + filter_logic: loose weight: 0 on_objects: - dcim.models.Device diff --git a/initializers/custom_fields.yml b/initializers/custom_fields.yml index ccde9a0..c502468 100644 --- a/initializers/custom_fields.yml +++ b/initializers/custom_fields.yml @@ -3,7 +3,6 @@ # label: Custom Text # description: Enter text in a text field. # required: false -# filterable: true # weight: 0 # on_objects: # - dcim.models.Device @@ -17,7 +16,7 @@ # label: Custom Number # description: Enter numbers into an integer field. # required: true -# filterable: true +# filter_logic: loose # weight: 10 # on_objects: # - tenancy.models.Tenant @@ -25,7 +24,7 @@ # type: selection # label: Choose between items # required: false -# filterable: true +# filter_logic: exact # weight: 30 # on_objects: # - dcim.models.Device @@ -44,7 +43,7 @@ # type: boolean # label: Yes Or No? # required: true -# filterable: true +# filter_logic: loose # default: "false" # important: but "false" in quotes! # weight: 90 # on_objects: @@ -54,13 +53,13 @@ # label: Hyperlink # description: Link to something nice. # required: true -# filterable: false +# filter_logic: disabled # on_objects: # - tenancy.models.Tenant # date_field: # type: date # label: Important Date # required: false -# filterable: false +# filter_logic: disabled # on_objects: # - dcim.models.Device diff --git a/startup_scripts/20_custom_fields.py b/startup_scripts/20_custom_fields.py index 5c40e37..5b8284e 100644 --- a/startup_scripts/20_custom_fields.py +++ b/startup_scripts/20_custom_fields.py @@ -36,8 +36,11 @@ with open('/opt/netbox/initializers/custom_fields.yml', 'r') as stream: if cf_details.get('description', 0): custom_field.description = cf_details['description'] - if cf_details.get('filterable', 0): - custom_field.is_filterables = cf_details['filterable'] + # If no filter_logic is specified then it will default to 'Loose' + if cf_details.get('filter_logic', 0): + for choice_id, choice_text in CF_FILTER_CHOICES: + if choice_text.lower() == cf_details['filter_logic']: + custom_field.filter_logic = choice_id if cf_details.get('label', 0): custom_field.label = cf_details['label'] From 7afa9454ba7dd98813c9eb165e069308bab26beb Mon Sep 17 00:00:00 2001 From: Grokzen Date: Fri, 18 May 2018 21:22:05 +0200 Subject: [PATCH 3/6] Bump version to 0.3.0 and add line in README describing the breaking change. --- README.md | 1 + VERSION | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a312dc6..29688ec 100644 --- a/README.md +++ b/README.md @@ -277,6 +277,7 @@ You can check the label of your local image by running `docker inspect ninech/ne The following is a list of breaking changes: +* 0.3.0: Field `filterable: /etc/netbox/config` and `/etc/reports -> /etc/netbox/reports`. Fixes [#54](https://github.com/ninech/netbox-docker/issues/54). * 0.1.0: Introduction of the `NETBOX_DOCKER_PROJECT_VERSION`. (Not a breaking change per se.) diff --git a/VERSION b/VERSION index 0ea3a94..0d91a54 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.2.0 +0.3.0 From 1be054bb0ef21468efda3c5d52c06dc5346de495 Mon Sep 17 00:00:00 2001 From: Samuel Sieg Date: Mon, 4 Jun 2018 11:17:41 +0200 Subject: [PATCH 4/6] Fix ssl package dependency --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d4cf167..261bbb1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN apk add --no-cache \ libxml2-dev \ libxslt-dev \ openldap-dev \ - openssl-dev \ + libressl-dev \ postgresql-dev \ wget From 26728c736688b10b5f94ea4ade0bd2994927c2c5 Mon Sep 17 00:00:00 2001 From: thde Date: Fri, 22 Jun 2018 16:27:45 +0200 Subject: [PATCH 5/6] add license --- LICENSE | 178 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 178 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..e454a52 --- /dev/null +++ b/LICENSE @@ -0,0 +1,178 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + From 10533ab4c35d98c79973c48f169cdf93843ef226 Mon Sep 17 00:00:00 2001 From: thde Date: Mon, 25 Jun 2018 10:41:31 +0200 Subject: [PATCH 6/6] add allow all hosts by default --- configuration/configuration.py | 2 +- netbox.env | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/configuration/configuration.py b/configuration/configuration.py index 7d704ae..f65356e 100644 --- a/configuration/configuration.py +++ b/configuration/configuration.py @@ -26,7 +26,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) # access to the server via any other hostnames. The first FQDN in the list will be treated as the preferred name. # # Example: ALLOWED_HOSTS = ['netbox.example.com', 'netbox.internal.local'] -ALLOWED_HOSTS = os.environ.get('ALLOWED_HOSTS', socket.gethostname()).split(' ') +ALLOWED_HOSTS = os.environ.get('ALLOWED_HOSTS', '*').split(' ') # PostgreSQL database configuration. DATABASE = { diff --git a/netbox.env b/netbox.env index b4b2b9b..a9958ea 100644 --- a/netbox.env +++ b/netbox.env @@ -1,4 +1,3 @@ -ALLOWED_HOSTS=localhost 0.0.0.0 127.0.0.1 [::1] netbox nginx netboxdocker.docker nginx.netboxdocker.docker DB_NAME=netbox DB_USER=netbox DB_PASSWORD=J5brHrAXFLQSif0K