diff --git a/netbox/templates/vpn/ikepolicy.html b/netbox/templates/vpn/ikepolicy.html
index 1bf49818b..559ba6d17 100644
--- a/netbox/templates/vpn/ikepolicy.html
+++ b/netbox/templates/vpn/ikepolicy.html
@@ -14,6 +14,10 @@
{% trans "Name" %} |
{{ object.name }} |
+
+ {% trans "Description" %} |
+ {{ object.description|placeholder }} |
+
{% trans "IKE Version" %} |
{{ object.get_version_display }} |
@@ -23,8 +27,19 @@
{{ object.get_mode_display }} |
- {% trans "Description" %} |
- {{ object.description|placeholder }} |
+ {% trans "Pre-Shared Key" %} |
+
+ {{ object.preshared_key|placeholder }}
+ {% if object.preshared_key %}
+
+ {% endif %}
+ |
+
+
+ {% trans "IPSec Profiles" %} |
+
+ {{ object.ipsec_profiles.count }}
+ |
@@ -39,6 +54,13 @@
+
{% plugin_full_width_page object %}
diff --git a/netbox/templates/vpn/ikeproposal.html b/netbox/templates/vpn/ikeproposal.html
index 6079f0771..33cf60c81 100644
--- a/netbox/templates/vpn/ikeproposal.html
+++ b/netbox/templates/vpn/ikeproposal.html
@@ -14,6 +14,10 @@
{% trans "Name" %} |
{{ object.name }} |
+
+ {% trans "Description" %} |
+ {{ object.description|placeholder }} |
+
{% trans "Authentication method" %} |
{{ object.get_authentication_method_display }} |
@@ -35,8 +39,10 @@
{{ object.sa_lifetime|placeholder }} |
- {% trans "Description" %} |
- {{ object.description|placeholder }} |
+ {% trans "IKE Policies" %} |
+
+ {{ object.ike_policies.count }}
+ |
diff --git a/netbox/templates/vpn/ipsecpolicy.html b/netbox/templates/vpn/ipsecpolicy.html
index 8b8343876..4960d9dd3 100644
--- a/netbox/templates/vpn/ipsecpolicy.html
+++ b/netbox/templates/vpn/ipsecpolicy.html
@@ -14,13 +14,19 @@
{% trans "Name" %} |
{{ object.name }} |
+
+ {% trans "Description" %} |
+ {{ object.description|placeholder }} |
+
{% trans "PFS group" %} |
{{ object.get_pfs_group_display|placeholder }} |
- {% trans "Description" %} |
- {{ object.description|placeholder }} |
+ {% trans "IPSec Profiles" %} |
+
+ {{ object.ipsec_profiles.count }}
+ |
@@ -35,6 +41,14 @@
+
+
{% plugin_full_width_page object %}
diff --git a/netbox/templates/vpn/ipsecprofile.html b/netbox/templates/vpn/ipsecprofile.html
index aa65393ae..07d1c15f0 100644
--- a/netbox/templates/vpn/ipsecprofile.html
+++ b/netbox/templates/vpn/ipsecprofile.html
@@ -22,23 +22,89 @@
{% trans "Mode" %} |
{{ object.get_mode_display }} |
-
- {% trans "IKE Policy" %} |
- {{ object.ike_policy|linkify }} |
-
-
- {% trans "IPSec Policy" %} |
- {{ object.ipsec_policy|linkify }} |
-
{% include 'inc/panels/tags.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/comments.html' %}
{% plugin_left_page object %}
- {% include 'inc/panels/custom_fields.html' %}
+
+
+
+
+
+ {% trans "Name" %} |
+ {{ object.ike_policy|linkify }} |
+
+
+ {% trans "Description" %} |
+ {{ object.ike_policy.description|placeholder }} |
+
+
+ {% trans "Version" %} |
+ {{ object.ike_policy.get_version_display }} |
+
+
+ {% trans "Mode" %} |
+ {{ object.ike_policy.get_mode_display }} |
+
+
+ {% trans "Proposals" %} |
+
+
+ {% for proposal in object.ike_policy.proposals.all %}
+ -
+ {{ proposal }}
+
+ {% endfor %}
+
+ |
+
+
+ {% trans "Pre-Shared Key" %} |
+ {% checkmark object.ike_policy.preshared_key %} |
+
+
+ {% trans "Certificate" %} |
+ {% checkmark object.ike_policy.certificate %} |
+
+
+
+
+
+
+
+
+
+ {% trans "Name" %} |
+ {{ object.ipsec_policy|linkify }} |
+
+
+ {% trans "Description" %} |
+ {{ object.ipsec_policy.description|placeholder }} |
+
+
+ {% trans "Proposals" %} |
+
+
+ {% for proposal in object.ipsec_policy.proposals.all %}
+ -
+ {{ proposal }}
+
+ {% endfor %}
+
+ |
+
+
+ {% trans "PFS Group" %} |
+ {{ object.ipsec_policy.get_pfs_group_display }} |
+
+
+
+
{% plugin_right_page object %}
diff --git a/netbox/templates/vpn/ipsecproposal.html b/netbox/templates/vpn/ipsecproposal.html
index ad375f4e3..7425eef43 100644
--- a/netbox/templates/vpn/ipsecproposal.html
+++ b/netbox/templates/vpn/ipsecproposal.html
@@ -14,6 +14,10 @@
{% trans "Name" %} |
{{ object.name }} |
+
+ {% trans "Description" %} |
+ {{ object.description|placeholder }} |
+
{% trans "Encryption algorithm" %} |
{{ object.get_encryption_algorithm_display }} |
@@ -31,8 +35,10 @@
{{ object.sa_lifetime_data|placeholder }} |
- {% trans "Description" %} |
- {{ object.description|placeholder }} |
+ {% trans "IPSec Policies" %} |
+
+ {{ object.ipsec_policies.count }}
+ |