diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 71c1e2178fbd26af187c08b5a559baf68a932561..514483d5598960cdb1b9cf1b929e688d1f80afa3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,7 +26,7 @@ lint-job: before_script: - python3 -m venv "$CI_PROJECT_DIR/plugins/venv" - source "$CI_PROJECT_DIR/plugins/venv/bin/activate" - - pip install pylint + - pip install 'pylint==3.2' script: - pylint "$CI_PROJECT_DIR/plugins/netbox-rps-plugin/netbox_rps_plugin" "$CI_PROJECT_DIR/plugins/netbox-rps-plugin/tests" - pylint "$CI_PROJECT_DIR/plugins/netbox-cert-plugin/netbox_cert_plugin" "$CI_PROJECT_DIR/plugins/netbox-cert-plugin/tests" diff --git a/env/netbox.env b/env/netbox.env index 530c6cc6c1095e33a04436b5cc2f7e2cf6ba1d65..2cc08acfc7cb7e0d922b6333eb0c269cb20d32bc 100644 --- a/env/netbox.env +++ b/env/netbox.env @@ -36,3 +36,4 @@ SUPERUSER_PASSWORD=thisnetboxisnot4u SUPERUSER_API_TOKEN=only4testingpurpose WEBHOOKS_ENABLED=true ACTIVATE_WORKER_AND_HOUSEKEEPING=1 +NO_PROXY=localhost,0.0.0.0 diff --git a/netbox_configuration/extra.py b/netbox_configuration/extra.py index 9ae9297e63a26336f188ae3806ccd73f7ea1f03e..25bb9037a08e45c1bc10c1d12afe23481c149563 100644 --- a/netbox_configuration/extra.py +++ b/netbox_configuration/extra.py @@ -104,3 +104,7 @@ DEFAULT_DASHBOARD = [ }, }, ] +HTTP_PROXIES={ + 'http':'${HTTP_PROXY}', + 'https':'${HTTPS_PROXY}', + } \ No newline at end of file