update to work with new way for the firewall

appinfo.yml

@@ -21,13 +21,13 @@ configdefinition:
       description: The key file used for the certificate.  ATM this nginx only supports one certificate (use wildcards)
     httpport:
       type: integer
-      default: 8080
-      minimum: 1025
+      default: 80
+      minimum: 1
       maximum: 65536
     httpsport:
       type: integer
-      default: 8443
-      minimum: 1025
+      default: 443
+      minimum: 1
       maximum: 65536
     listenhttpaddress4:
       type: string
@@ -45,22 +45,25 @@ configdefinition:
       type: string
       format: ipv6
       default: "::"
-imports:
-  web:
-    "$id": "web import"
-    "$schema": "http://json-schema.org/draft-07/schema#"
-    description: What we import from other apps under the web key.  To define what we need to proxy
-    type: array
-    items:
-      type: object
-      additionalProperties: false
-      properties:
-        proxyaddress:
-          type: string
-          description: The address to proxy to
-        publicname:
-          default: ""
-          type: string
-          description: The public address to expose, it will be sufixed by the domainname we use.  Will default to the appname
-      required:
-        - proxyaddress
+ports:
+    - http
+    - https
+exports:
+  firewall:
+    redirect:
+      - from: "{{ config.httpport }}"
+        to: "{{ ports.http }}"
+        version: ipv4
+        ip: "{{ config.listenhttpaddress4 }}"
+      - from: "{{ config.httpsport }}"
+        to: "{{ ports.https }}"
+        version: ipv4
+        ip: "{{ config.listenhttpaddress4 }}"
+      - from: "{{ config.httpport }}"
+        to: "{{ ports.http }}"
+        version: ipv6
+        ip: "{{ config.listenhttpaddress6 }}"
+      - from: "{{ config.httpsport }}"
+        to: "{{ ports.https }}"
+        version: ipv6
+        ip: "{{ config.listenhttpaddress6 }}"