From 4a39ea0d0c284df16a9234321ccaecb05584077d Mon Sep 17 00:00:00 2001
From: Monviech <79600909+Monviech@users.noreply.github.com>
Date: Mon, 22 Apr 2024 09:39:35 +0200
Subject: [PATCH] www/caddy: Change display of domain and port combination in
 Model Relation Field (#3927)

* Update Caddy.xml - Replace ":" with "." in Model Relation Field.

Since a stray ":" when leaving the port empty could cause confusion, I have opted to replace it with a "."

This adheres to the standard of FQDNs ending with a "DOT" at the end (RFC 1034). Note: This changes only what is displayed, not the stored data itself.

This change makes an empty port in the GUI look like this:

example.com.

And with a port, like this:

example.com.443

(Compare to: https://github.com/opnsense/plugins/issues/3917#issuecomment-2064230068 )

* Update Makefile - Bump revision to 1

* Actually just use a space, that one causes the least confusion.

* Update www/caddy/Makefile

---------

Co-authored-by: Franco Fichtner <franco@lastsummer.de>
---
 .../src/opnsense/mvc/app/models/OPNsense/Caddy/Caddy.xml    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/www/caddy/src/opnsense/mvc/app/models/OPNsense/Caddy/Caddy.xml b/www/caddy/src/opnsense/mvc/app/models/OPNsense/Caddy/Caddy.xml
index af002c9ea..1aa9308fc 100644
--- a/www/caddy/src/opnsense/mvc/app/models/OPNsense/Caddy/Caddy.xml
+++ b/www/caddy/src/opnsense/mvc/app/models/OPNsense/Caddy/Caddy.xml
@@ -163,7 +163,7 @@
                             <source>OPNsense.Caddy.Caddy</source>
                             <items>reverseproxy.reverse</items>
                             <display>FromDomain,FromPort</display>
-                            <display_format>%s:%s</display_format>
+                            <display_format>%s %s</display_format>
                         </reverseproxy>
                     </Model>
                 </reverse>
@@ -215,7 +215,7 @@
                             <source>OPNsense.Caddy.Caddy</source>
                             <items>reverseproxy.reverse</items>
                             <display>FromDomain,FromPort</display>
-                            <display_format>%s:%s</display_format>
+                            <display_format>%s %s</display_format>
                         </reverseproxy>
                     </Model>
                 </reverse>
@@ -225,7 +225,7 @@
                             <source>OPNsense.Caddy.Caddy</source>
                             <items>reverseproxy.subdomain</items>
                             <display>FromDomain,FromPort</display>
-                            <display_format>%s:%s</display_format>
+                            <display_format>%s %s</display_format>
                         </reverseproxy>
                     </Model>
                 </subdomain>