From 994a7a1d4bba5e57d485a8e9b0478d0ffc68132e Mon Sep 17 00:00:00 2001
From: James Valleroy <jvalleroy@mailbox.org>
Date: Sat, 27 Jun 2020 08:15:05 -0400
Subject: [PATCH] networks: Remove firewall zone warning

Mention that interface is automatically assigned to external zone.

Test:
- Re-assigned host0 interface to public zone. Disabled firewalld to
still access interface. Firewall zone is shown as "external" with the
note about automatic assignment.

Closes: #1858.

Signed-off-by: James Valleroy <jvalleroy@mailbox.org>
Reviewed-by: Sunil Mohan Adapa <sunil@medhas.org>
---
 .../networks/templates/connection_show.html   | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/plinth/modules/networks/templates/connection_show.html b/plinth/modules/networks/templates/connection_show.html
index aca1bdba5..e0a35a81f 100644
--- a/plinth/modules/networks/templates/connection_show.html
+++ b/plinth/modules/networks/templates/connection_show.html
@@ -294,19 +294,22 @@
           <div class="list-group-item">
             {% trans "Firewall zone" %}
             <div class="pull-right">
-              <span class="label label-danger">{{ connection.zone }}</span>
+              <span class="label label-warning">external</span>
             </div>
           </div>
         </div>
 
-        <div class="alert alert-danger">
-          <span class="fa fa-exclamation-circle" aria-hidden="true"></span>
+        <div class="alert alert-info">
+          <span class="fa fa-info-circle" aria-hidden="true"></span>
           {% blocktrans trimmed %}
-            This interface is not maintained by {{ box_name }}.  Its
-            security status is unknown to {{ box_name }}.  Many {{ box_name }}
-            services may not be available on this interface.  It is
-            recommended that you deactivate or delete this connection and
-            re-configure it.
+            This interface is not maintained by {{ box_name }}.  For security,
+            it is automatically assigned to the external zone.
+          {% endblocktrans %}
+          {% blocktrans trimmed %}
+            This interface should receive your Internet connection.
+            If you connect it to a local network/machine, many
+            services meant to available only internally will not be
+            available.
           {% endblocktrans %}
         </div>
       {% endif %}