From d37ed8485c451cbfc47c044ab08819dfc286e77a Mon Sep 17 00:00:00 2001
From: AlexGacon <alexandre.gacon@gmail.com>
Date: Tue, 26 Nov 2024 10:38:42 +0100
Subject: [PATCH] Take review comments into account

---
 .../geoserver-printing-config-yaml.yaml       | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/charts/geonode/templates/geoserver/geoserver-printing-config-yaml.yaml b/charts/geonode/templates/geoserver/geoserver-printing-config-yaml.yaml
index a713489..c57f191 100644
--- a/charts/geonode/templates/geoserver/geoserver-printing-config-yaml.yaml
+++ b/charts/geonode/templates/geoserver/geoserver-printing-config-yaml.yaml
@@ -5,6 +5,8 @@ metadata:
   namespace: {{ .Release.Namespace }}
 data:
   config.yaml: |
+    # The content is a copy from the one available in https://github.com/GeoNode/geoserver-geonode-ext
+    # It is provided through the geoserver_data docker image but we need to override it
     #===========================================================================
     # allowed DPIs
     #===========================================================================
@@ -53,14 +55,13 @@ data:
     disableScaleLocking: true
     #======
     brokenUrlPlaceholder: 'default'
-    # brokenUrlPlaceholder: 'throw'
 
-    #proxyBaseUrl: http://geoserver:8080/geoserver/pdf
     connectionTimeout: 2000
     socketTimeout: 2000
 
     #===========================================================================
     # the list of allowed ips
+    # The original list is available here : https://github.com/GeoNode/geoserver-geonode-ext/blob/main/data/printing/config.yaml
     #===========================================================================
     hosts:
       - !ipMatch
@@ -70,12 +71,6 @@ data:
       - !dnsMatch
         host: localhost
         port: 80
-      - !dnsMatch
-        host: {{ .Values.geonode.general.externalDomain }}
-        port: 8080
-      - !dnsMatch
-        host: {{ .Values.geonode.general.externalDomain }}
-        port: 443
       - !dnsMatch
         host: labs.metacarta.com
         port: 80
@@ -148,6 +143,14 @@ data:
       - !dnsMatch
         host: api.mapbox.com/styles/v1/mapbox/streets-v9/tiles
         port: 80
+      # GeoNode K8s addition (rules to access the geoserver services with an external domain)
+      - !dnsMatch
+        host: {{ .Values.geonode.general.externalDomain }}
+        port: 8080
+      - !dnsMatch
+        host: {{ .Values.geonode.general.externalDomain }}
+        port: 443
+      # GeoNode K8s addition (custom rules)
       {{- with .Values.geoserver.printing.extraHosts }}
       {{- tpl . $ | nindent 6 }}
       {{- end }}