Fix print

geoportal/c2cgeoportal_geoportal/scaffolds/create/print/print-apps/+package+/config.yaml.tmpl

@@ -49,7 +49,7 @@ templates:
         httpProcessors:
           - !mapUri
             mapping:
-              (https?)://${VISIBLE_WEB_HOST_RE_ESCAPED}/(.*): "http://${GEOPORTAL_INTERNAL_URL}/$2"
+              (https?)://${VISIBLE_WEB_HOST_RE_ESCAPED}${VISIBLE_ENTRY_POINT_RE_ESCAPED}(.*): "${GEOPORTAL_INTERNAL_URL}${VISIBLE_ENTRY_POINT}$2"
           - !forwardHeaders
             matchers:
               - !localMatch {}
@@ -62,12 +62,11 @@ templates:
               - X-Request-ID
           - !restrictUris
             matchers:
-              - !localMatch
-                pathRegex: '${VISIBLE_ENTRY_POINT_RE_ESCAPED}mapserv_proxy'
-              - !localMatch
-                pathRegex: '${VISIBLE_ENTRY_POINT_RE_ESCAPED}tiles/.*'
               - !localMatch
                 reject: true
+              - !hostnameMatch
+                host: geoportal
+                port: 8080
               - !ipMatch
                 ip: 10.0.0.0
                 mask: 255.0.0.0

geoportal/c2cgeoportal_geoportal/scaffolds/update/CONST_vars.yaml_tmpl

@@ -34,8 +34,8 @@ vars:
         PGUSER: www-data
         PGPASSWORD: www-data
         PGDATABASE: geomapfish
-        GEOPORTAL_INTERNAL_URL: http://geoportal/
-        MAPCACHE_URL: http://mapcache/mapcache/
+        GEOPORTAL_INTERNAL_URL: http://geoportal:8080
+        MAPCACHE_URL: http://mapcache:8080/mapcache/
         MAPSERVER_URL: http://mapserver:8080/
         MEMCACHED_HOST: memcached
         MEMCACHED_PORT: 11211