split target host port and no subdomain in proxymode

Signed-off-by: Jean-Yves <7360784+docjyJ@users.noreply.github.com>
nextcloud · Jul 14, 2024 · 5737873 · 5737873
1 parent cbfd69f
commit 5737873
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 36 deletions.
diff --git a/Containers/apache/caddyfile.sh b/Containers/apache/caddyfile.sh
@@ -37,13 +37,14 @@ function template_loop_route {
   IFS=',' read -ra array <<< "$1"
   ROUTE="${array[0]}"
   URI_STRIP_PREFIX="${array[1]}"
-  TARGET="${array[2]}"
+  TARGET_HOST="${array[2]}"
+  TARGET_PORT="${array[3]}"
 
   cat << CADDY
 
     route $(test -z "$ROUTE" || echo "$ROUTE/* "){
         $([ "$URI_STRIP_PREFIX" == "1" ] && echo "uri strip_prefix $ROUTE")
-        reverse_proxy $TARGET
+        reverse_proxy $TARGET_HOST:$TARGET_PORT
     }
 CADDY
 }
@@ -55,6 +56,11 @@ function template_loop_subdomain {
   SUBDOMAIN="${array[0]}"
   ROUTES="${array[1]}"
 
+  if [ -z "$TRUSTED_DOMAINS" ] && [ -n "$SUBDOMAIN" ]; then
+    # Ignore subdomains if in proxy mode
+    exit 0
+  fi
+
   cat << CADDY
 
 $(echo "$TRUSTED_DOMAINS" | tr ',' '\n' | sed "s/.*/$PROTOCOL:\/\/$SUBDOMAIN&:$APACHE_PORT/" | sed '$ ! s/$/,/') {

diff --git a/community-containers/lldap/lldap.json b/community-containers/lldap/lldap.json
@@ -8,18 +8,11 @@
       "image_tag": "v0-alpine",
       "internal_port": "17170",
       "restart": "unless-stopped",
-      "ports": [
-        {
-          "ip_binding": "%APACHE_IP_BINDING%",
-          "port_number": "17170",
-          "protocol": "tcp"
-        }
-      ],
       "caddy_routes": [
         {
           "route": "",
           "sub_domain": "ldap.",
-          "target": "nextcloud-aio-lldap:17170",
+          "target_port": "17170",
           "uri_strip_prefix": false
         }
       ],

diff --git a/community-containers/nocodb/nocodb.json b/community-containers/nocodb/nocodb.json
@@ -8,18 +8,11 @@
             "image_tag": "%AIO_CHANNEL%",
             "internal_port": "10028",
             "restart": "unless-stopped",
-            "ports": [
-                {
-                    "ip_binding": "%APACHE_IP_BINDING%",
-                    "port_number": "10028",
-                    "protocol": "tcp"
-                }
-            ],
             "caddy_routes": [
                 {
                     "route": "",
                     "sub_domain": "tables.",
-                    "target": "nextcloud-aio-nocodb:10028",
+                    "target_port": "10028",
                     "uri_strip_prefix": false
                 }
             ],

diff --git a/community-containers/stalwart/stalwart.json b/community-containers/stalwart/stalwart.json
@@ -38,18 +38,13 @@
                   "ip_binding": "",
                   "port_number": "4190",
                   "protocol": "tcp"
-                },
-                {
-                  "ip_binding": "%APACHE_IP_BINDING%",
-                  "port_number": "10003",
-                  "protocol": "tcp"
                 }
             ],
           "caddy_routes": [
             {
               "route": "",
               "sub_domain": "mail.",
-              "target": "nextcloud-aio-stalwart:10003",
+              "target_port": "10003",
               "uri_strip_prefix": false
             }
           ],

diff --git a/php/containers-schema.json b/php/containers-schema.json
@@ -185,9 +185,9 @@
 									"type": "string",
 									"pattern": "^([a-z-]*\\.)*$"
 								},
-								"target": {
+								"target_port": {
 									"type": "string",
-									"pattern": "^nextcloud-aio-[a-z-]+:[0-9]+$"
+									"pattern": "^[0-9]{1,5})$"
 								},
 								"uri_strip_prefix": {
 									"type": "boolean"

diff --git a/php/containers.json b/php/containers.json
@@ -252,7 +252,7 @@
         {
           "route": "/push",
           "sub_domain": "",
-          "target": "nextcloud-aio-notify-push:7867",
+          "target_port": "7867",
           "uri_strip_prefix": true
         }
       ],
@@ -336,19 +336,19 @@
         {
           "route": "/browser",
           "sub_domain": "",
-          "target": "nextcloud-aio-collabora:9980",
+          "target_port": "9980",
           "uri_strip_prefix": false
         },
         {
           "route": "/hosting",
           "sub_domain": "",
-          "target": "nextcloud-aio-collabora:9980",
+          "target_port": "9980",
           "uri_strip_prefix": false
         },
         {
           "route": "/cool",
           "sub_domain": "",
-          "target": "nextcloud-aio-collabora:9980",
+          "target_port": "9980",
           "uri_strip_prefix": false
         }
       ],
@@ -405,7 +405,7 @@
         {
           "route": "/standalone-signaling",
           "sub_domain": "",
-          "target": "nextcloud-aio-talk:8081",
+          "target_port": "8081",
           "uri_strip_prefix": true
         }
       ],

diff --git a/php/src/Container/ContainerCaddyRoute.php b/php/src/Container/ContainerCaddyRoute.php
@@ -6,18 +6,21 @@
 class ContainerCaddyRoute {
     public string $route;
     public string $subDomain;
-    public string $target;
+    public string $target_host;
+    public string $target_port;
     public string $uriStripPrefix;
 
     public function __construct(
         string $route,
         string $subDomain,
-        string $target,
+        string $target_host,
+        string $target_port,
         string $uriStripPrefix
     ) {
         $this->route = $route;
         $this->subDomain = $subDomain;
-        $this->target = $target;
+        $this->target_host = $target_host;
+        $this->target_port = $target_port;
         $this->uriStripPrefix = $uriStripPrefix;
     }
 }
diff --git a/php/src/Container/ContainerCaddyRoutes.php b/php/src/Container/ContainerCaddyRoutes.php
@@ -26,7 +26,7 @@ public function GetFormatedEnv() : string {
             if (!array_key_exists($subDomain, $caddyRouteBySubDomain)) {
                 $caddyRouteBySubDomain[$subDomain] = [];
             }
-            $caddyRouteBySubDomain[$subDomain][] =  $caddyRoute->route.",".$caddyRoute->uriStripPrefix.",".$caddyRoute->target ;
+            $caddyRouteBySubDomain[$subDomain][] =  $caddyRoute->route.",".$caddyRoute->uriStripPrefix.",".$caddyRoute->target_host.",".$caddyRoute->target_port ;
         }
 
         $subDomainGroups = [];

diff --git a/php/src/ContainerDefinitionFetcher.php b/php/src/ContainerDefinitionFetcher.php
@@ -165,7 +165,8 @@ private function GetDefinition(): array
                         new ContainerCaddyRoute(
                             $value['route'],
                             $value['sub_domain'],
-                            $value['target'],
+                            $entry['container_name'],
+                            $value['target_port'],
                             $value['uri_strip_prefix']
                         )
                     );