瀏覽代碼

Working on deployment 2

Owen Schwartz 9 月之前
父節點
當前提交
a90347183d

+ 1 - 1
server/routers/gerbil/getConfig.ts

@@ -122,7 +122,7 @@ async function getNextAvailableSubnet(): Promise<string> {
     }
 
     // replace the last octet with 1
-    subnet = subnet.split('.').slice(0, 3).join('.') + '.1';
+    subnet = subnet.split('.').slice(0, 3).join('.') + '.1' + subnet.split('/')[1];
     return subnet;
 }
 

+ 11 - 12
src/app/[orgId]/layout.tsx

@@ -68,18 +68,17 @@ export default async function ConfigurationLaytout(
     }
 
     let orgs: ListOrgsResponse["orgs"] = [];
-    try {
-        const res = await internal.get<AxiosResponse<ListOrgsResponse>>(
-            `/orgs`,
-            cookie
-        );
-        if (res && res.data.data.orgs) {
-            orgs = res.data.data.orgs;
-        }
-    } catch (e) {
-        console.error("Error fetching orgs", e);
-    }
-
+    // try {
+    //     const res = await internal.get<AxiosResponse<ListOrgsResponse>>(
+    //         `/orgs`,
+    //         cookie
+    //     );
+    //     if (res && res.data.data.orgs) {
+    //         orgs = res.data.data.orgs;
+    //     }
+    // } catch (e) {
+    //     console.error("Error fetching orgs", e);
+    // }
     return (
         <>
             <div className="w-full bg-muted mb-6 select-none sm:px-0 px-3 pt-3">

+ 1 - 1
src/app/[orgId]/sites/[niceId]/components/CreateSite.tsx

@@ -118,7 +118,7 @@ PrivateKey = ${keypair.privateKey}
 
 [Peer]
 PublicKey = ${siteDefaults.publicKey}
-AllowedIPs = ${siteDefaults.address}
+AllowedIPs = ${siteDefaults.address.split("/")[0]}/32
 Endpoint = ${siteDefaults.endpoint}:${siteDefaults.listenPort}
 PersistentKeepalive = 5`
         : "";