From 7b55521863ac40226fc877c07e2d36d3e96fbb74 Mon Sep 17 00:00:00 2001
From: Arkadiusz SZCZECINSKI <arkadiusz.szczecinski@ext.ec.europa.eu>
Date: Mon, 23 Sep 2024 13:58:08 +0200
Subject: [PATCH 1/6] Update file extra.py
---
netbox_configuration/extra.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/netbox_configuration/extra.py b/netbox_configuration/extra.py
index 9ae9297..a93177d 100644
--- a/netbox_configuration/extra.py
+++ b/netbox_configuration/extra.py
@@ -104,3 +104,7 @@ DEFAULT_DASHBOARD = [
},
},
]
+HTTP_PROXIES = {
+ 'http': environ.get('HTTP_PROXY', None),
+ 'https': environ.get('HTTPS_PROXY', None),
+}
\ No newline at end of file
--
GitLab
From df34b8d2b8f2d2397e49eadfffc74092e8b33e01 Mon Sep 17 00:00:00 2001
From: Arkadiusz SZCZECINSKI <arkadiusz.szczecinski@ext.ec.europa.eu>
Date: Mon, 23 Sep 2024 14:36:57 +0200
Subject: [PATCH 2/6] Revert to lint 3.2
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 71c1e21..514483d 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"
--
GitLab
From 8280e04a9ae6dde4ca41867060c0e7888ce0705c Mon Sep 17 00:00:00 2001
From: Arkadiusz SZCZECINSKI <arkadiusz.szczecinski@ext.ec.europa.eu>
Date: Mon, 23 Sep 2024 15:08:10 +0200
Subject: [PATCH 3/6] =?UTF-8?q?=F0=9F=92=9A=20Fix=20localhost=20helthcheck?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
env/netbox.env | 1 +
1 file changed, 1 insertion(+)
diff --git a/env/netbox.env b/env/netbox.env
index 530c6cc..2cc08ac 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
--
GitLab
From 6861fe9cab61108b7f4bb298c1001208d40ab697 Mon Sep 17 00:00:00 2001
From: Arkadiusz Szczecinski <arkadiusz.szczecinski@ext.ec.europa.eu>
Date: Tue, 24 Sep 2024 13:10:01 +0200
Subject: [PATCH 4/6] =?UTF-8?q?=F0=9F=A9=B9=20fix=20proxy=20settings=20def?=
=?UTF-8?q?inition?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
netbox_configuration/extra.py | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/netbox_configuration/extra.py b/netbox_configuration/extra.py
index a93177d..c00b752 100644
--- a/netbox_configuration/extra.py
+++ b/netbox_configuration/extra.py
@@ -104,7 +104,9 @@ DEFAULT_DASHBOARD = [
},
},
]
-HTTP_PROXIES = {
- 'http': environ.get('HTTP_PROXY', None),
- 'https': environ.get('HTTPS_PROXY', None),
-}
\ No newline at end of file
+{% if '${HTTP_PROXY}' is defined %}
+ HTTP_PROXIES = {
+ 'http': '${HTTP_PROXY}',
+ 'https': '${HTTPS_PROXY}',
+ }
+{% endif %}
--
GitLab
From 71c2d4e8ab4534867a581b7d7c1d842bcebbac83 Mon Sep 17 00:00:00 2001
From: Arkadiusz Szczecinski <arkadiusz.szczecinski@ext.ec.europa.eu>
Date: Tue, 24 Sep 2024 13:17:26 +0200
Subject: [PATCH 5/6] =?UTF-8?q?=F0=9F=A9=B9=20fix=20proxy=20settings=20def?=
=?UTF-8?q?inition?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
netbox_configuration/extra.py | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/netbox_configuration/extra.py b/netbox_configuration/extra.py
index c00b752..ca0cf5b 100644
--- a/netbox_configuration/extra.py
+++ b/netbox_configuration/extra.py
@@ -104,9 +104,4 @@ DEFAULT_DASHBOARD = [
},
},
]
-{% if '${HTTP_PROXY}' is defined %}
- HTTP_PROXIES = {
- 'http': '${HTTP_PROXY}',
- 'https': '${HTTPS_PROXY}',
- }
-{% endif %}
+"{% if '${HTTP_PROXY}' is defined %} HTTP_PROXIES={'http':'${HTTP_PROXY}','https':'${HTTPS_PROXY}',}{% endif %}"
--
GitLab
From 7a4df1df002565798cc5c5c7105e7cf8295706a8 Mon Sep 17 00:00:00 2001
From: Arkadiusz Szczecinski <arkadiusz.szczecinski@ext.ec.europa.eu>
Date: Tue, 24 Sep 2024 13:36:40 +0200
Subject: [PATCH 6/6] =?UTF-8?q?=F0=9F=A9=B9=20fix=20proxy=20settings=20def?=
=?UTF-8?q?inition?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
netbox_configuration/extra.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/netbox_configuration/extra.py b/netbox_configuration/extra.py
index ca0cf5b..25bb903 100644
--- a/netbox_configuration/extra.py
+++ b/netbox_configuration/extra.py
@@ -104,4 +104,7 @@ DEFAULT_DASHBOARD = [
},
},
]
-"{% if '${HTTP_PROXY}' is defined %} HTTP_PROXIES={'http':'${HTTP_PROXY}','https':'${HTTPS_PROXY}',}{% endif %}"
+HTTP_PROXIES={
+ 'http':'${HTTP_PROXY}',
+ 'https':'${HTTPS_PROXY}',
+ }
\ No newline at end of file
--
GitLab