Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.2.0 #493

Merged
merged 62 commits into from
Apr 27, 2021
Merged
Changes from 1 commit
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
020e0ad
update .gitignore to keep extra.py in ldap config
ryanmerolle Feb 22, 2021
22186b2
do not set AUTH_LDAP_MIRROR_GROUPS if not defined
ryanmerolle Feb 22, 2021
0dec4d8
Add extra.py example for ldap config
ryanmerolle Feb 22, 2021
f19d650
Merge pull request #1 from netbox-community/develop
ryanmerolle Feb 25, 2021
edb61f3
Sponsor Message
cimnine Mar 11, 2021
8f119ed
Merge pull request #469 from cimnine/Sponsoring
cimnine Mar 12, 2021
ce6fe5c
Update dependency ruamel.yaml to v0.17.0
renovate-bot Mar 26, 2021
61eecdd
Merge pull request #477 from netbox-community/renovate/ruamel.yaml-0.x
cimnine Mar 26, 2021
cca79b5
Update dependency ruamel.yaml to v0.17.2
renovate-bot Mar 29, 2021
9ab202f
Merge pull request #479 from netbox-community/renovate/ruamel.yaml-0.x
cimnine Mar 29, 2021
a2e33c1
Fix link name reference if content type is invalid
marcus-crane Apr 1, 2021
5944086
Rack groups have been renamed to locations
tobiasge Apr 7, 2021
45824ba
Devices can be added to locations
tobiasge Apr 7, 2021
b18e4aa
Fix super-linter on PRs
tobiasge Apr 7, 2021
1c4b674
Fixed isort issues
tobiasge Apr 7, 2021
9874cef
VLAN Groups can be scoped to multiple types
tobiasge Apr 7, 2021
3673196
Fields in Custom links have been renamed
tobiasge Apr 7, 2021
a572d5f
Update dependency ruamel.yaml to v0.17.4
renovate-bot Apr 7, 2021
14c0d17
Merge pull request #486 from netbox-community/renovate/ruamel.yaml-0.x
cimnine Apr 12, 2021
a5da382
Merge pull request #482 from Daimler/custom-link-error-fix
cimnine Apr 13, 2021
f637de8
Improved error logging
tobiasge Apr 13, 2021
752f592
Fixed Python f-string
tobiasge Apr 13, 2021
6e7d5a6
Fix quoting of exec argument in the entrypoint script
jhujhiti Apr 15, 2021
eee07f7
Merge pull request #492 from jhujhiti/upstreaming
cimnine Apr 16, 2021
c7df608
Merge pull request #485 from tobiasge/prepare-2.11
tobiasge Apr 16, 2021
d5c92e9
Preparation for 1.2.0
tobiasge Apr 16, 2021
a89d2e0
Don't publish Netbox on random port
tobiasge Apr 17, 2021
6879412
Merge pull request #495 from tobiasge/no-random-port
tobiasge Apr 19, 2021
53d759e
Update dependency django-auth-ldap to v2.4.0
renovate-bot Apr 19, 2021
28a2628
Merge pull request #3 from netbox-community/develop
ryanmerolle Apr 20, 2021
5304c8f
Merge pull request #483 from netbox-community/renovate/django-auth-ld…
cimnine Apr 20, 2021
222ede2
enahance ldap extra.py with more examples
ryanmerolle Apr 20, 2021
6f4d025
backed out ldap_config changes
ryanmerolle Apr 20, 2021
f2731d3
Merge pull request #448 from ryanmerolle/develop
cimnine Apr 20, 2021
eb5cc88
Add expample plugin configuration
ryanmerolle Apr 20, 2021
8176ef8
Add expample logging configuration
ryanmerolle Apr 20, 2021
b69a97d
add LOGLEVEL into netbox.env
ryanmerolle Apr 20, 2021
9fab9a3
mention plugin wiki page in plugins.py comment
ryanmerolle Apr 20, 2021
69dd876
switch plugin example to netbox_bgp
ryanmerolle Apr 20, 2021
5d4ecb7
user, group, & permissions fix
ryanmerolle Apr 20, 2021
a7a5d13
updated given linting feedback
ryanmerolle Apr 20, 2021
b1bcfcb
fix isort on groups & permissions scripts
ryanmerolle Apr 21, 2021
744ed91
permissions script cleanup
ryanmerolle Apr 21, 2021
71d8ac1
correct issues with users.yml spacing
ryanmerolle Apr 21, 2021
45889c3
commented out the logging
ryanmerolle Apr 24, 2021
a1e0c52
revert startup scripts to use key for object name
ryanmerolle Apr 24, 2021
ff0bc97
correct ldap example var name case
ryanmerolle Apr 24, 2021
d1b70ba
Merge pull request #499 from ryanmerolle/ldap-example-var-name
cimnine Apr 24, 2021
4e31218
update object permission conditionals
ryanmerolle Apr 25, 2021
528bc17
correct flake8 in object_permissions.py
ryanmerolle Apr 25, 2021
12401f2
correct black formatting for object_permissions.py
ryanmerolle Apr 25, 2021
474ca9e
fully working object permissions
ryanmerolle Apr 25, 2021
9654513
remove example evn var for logging
ryanmerolle Apr 25, 2021
604ff3b
Merge branch 'plugins-and-logging' of https://github.com/ryanmerolle/…
cimnine Apr 26, 2021
f924e76
Formatting
cimnine Apr 26, 2021
3d063a4
Merge branch 'ryanmerolle-plugins-and-logging' into develop
cimnine Apr 26, 2021
5b34df1
Build feature branch
tobiasge Apr 24, 2021
8678ad9
update permission user & group lookup as suggested
ryanmerolle Apr 26, 2021
1f3d946
apply black formating to all startup_scripts
ryanmerolle Apr 26, 2021
73b07a7
Merge pull request #500 from ryanmerolle/python-formatting
cimnine Apr 26, 2021
fd55ec2
Merge pull request #497 from ryanmerolle/startup-scripts-2.10+
tobiasge Apr 27, 2021
60428d5
Merge pull request #498 from tobiasge/build-feature-branch
cimnine Apr 27, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions configuration/ldap/extra.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,28 @@
####
## This file contains extra configuration options that can't be configured
## directly through environment variables.
## All vairables set here overwrite any existing found in ldap_config.py
####

# import ldap
# # This Python script inherits all the imports from ldap_config.py
# from django_auth_ldap.config import LDAPGroupQuery # Imported since not in ldap_config.py

# AUTH_LDAP_MIRROR_GROUPS = ["netbox-group-1", "netbox-group-2"]
# # Sets a base requirement of membetship to netbox-user-ro, netbox-user-rw, or netbox-user-admin.
# AUTH_LDAP_REQUIRE_GROUP = (
# LDAPGroupQuery("cn=netbox-user-ro,ou=groups,dc=example,dc=com")
# | LDAPGroupQuery("cn=netbox-user-rw,ou=groups,dc=example,dc=com")
# | LDAPGroupQuery("cn=netbox-user-admin,ou=groups,dc=example,dc=com")
# )

# # Sets LDAP Flag groups variables with example.
# AUTH_LDAP_USER_FLAGS_BY_GROUP = {
# "is_staff": (
# LDAPGroupQuery("cn=netbox-user-ro,ou=groups,dc=example,dc=com")
# | LDAPGroupQuery("cn=netbox-user-rw,ou=groups,dc=example,dc=com")
# | LDAPGroupQuery("cn=netbox-user-admin,ou=groups,dc=example,dc=com")
# ),
# "is_superuser": "cn=netbox-user-admin,ou=groups,dc=example,dc=com",
# }

# # Sets LDAP Mirror groups variables with example groups
# AUTH_LDAP_MIRROR_groups = ["netbox-user-ro", "netbox-user-rw", "netbox-user-admin"]