From d12a3175763560a13e1cb72deef41298a1f5dd52 Mon Sep 17 00:00:00 2001
From: samaradel <samar@incubaid.com>
Date: Wed, 14 May 2025 16:06:50 +0300
Subject: [PATCH 1/2] - Update funkwhale flist - Update the env keys - Update
 the disk mountPoint - Update gateway name port

---
 packages/grid_client/src/helpers/flists.ts       |  2 +-
 packages/playground/src/weblets/tf_funkwhale.vue | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/grid_client/src/helpers/flists.ts b/packages/grid_client/src/helpers/flists.ts
index c3c2fddde6..cc44e6c1b0 100644
--- a/packages/grid_client/src/helpers/flists.ts
+++ b/packages/grid_client/src/helpers/flists.ts
@@ -93,7 +93,7 @@ export const FLISTS = {
     entryPoint: "/sbin/zinit init",
   },
   FUNKWHALE: {
-    value: "https://hub.grid.tf/tf-official-apps/funkwhale-1.4.0.flist",
+    value: "https://hub.grid.tf/petep.3bot/threefolddev-funkwhale-1.4.0.flist",
     entryPoint: "/sbin/zinit init",
   },
   GITEA: {
diff --git a/packages/playground/src/weblets/tf_funkwhale.vue b/packages/playground/src/weblets/tf_funkwhale.vue
index 6f81a4d57f..eaa221fbac 100644
--- a/packages/playground/src/weblets/tf_funkwhale.vue
+++ b/packages/playground/src/weblets/tf_funkwhale.vue
@@ -222,7 +222,7 @@ async function deploy() {
           disks: [
             {
               size: solution.value.disk,
-              mountPoint: "/data",
+              mountPoint: "/var/lib/docker/",
             },
           ],
           flist: flist.value,
@@ -234,9 +234,9 @@ async function deploy() {
           envs: [
             { key: "SSH_KEY", value: selectedSSHKeys.value },
             { key: "FUNKWHALE_HOSTNAME", value: domain },
-            { key: "DJANGO_SUPERUSER_EMAIL", value: email.value },
-            { key: "DJANGO_SUPERUSER_USERNAME", value: username.value },
-            { key: "DJANGO_SUPERUSER_PASSWORD", value: password.value },
+            { key: "FUNKWHALE_SUPERUSER_EMAIL", value: email.value },
+            { key: "FUNKWHALE_SUPERUSER_NAME", value: username.value },
+            { key: "FUNKWHALE_SUPERUSER_PASSWORD", value: password.value },
           ],
           nodeId: selectionDetails.value!.node!.nodeId,
           rentedBy: rentedBy.value,
@@ -261,7 +261,7 @@ async function deploy() {
     await deployGatewayName(grid, selectionDetails.value.domain, {
       subdomain,
       ip: vm[0].interfaces[0].ip,
-      port: 80,
+      port: 5000,
       network: vm[0].interfaces[0].network,
     });
 

From 17b59493471c167efc828fb0a02a6dcce593aaff Mon Sep 17 00:00:00 2001
From: samaradel <samar@incubaid.com>
Date: Thu, 15 May 2025 16:45:09 +0300
Subject: [PATCH 2/2] - Remove Username field - Use Name as username of the
 funkwhale account

---
 .../playground/src/weblets/tf_funkwhale.vue   | 22 ++-----------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/packages/playground/src/weblets/tf_funkwhale.vue b/packages/playground/src/weblets/tf_funkwhale.vue
index eaa221fbac..482b832798 100644
--- a/packages/playground/src/weblets/tf_funkwhale.vue
+++ b/packages/playground/src/weblets/tf_funkwhale.vue
@@ -26,24 +26,7 @@
         #="{ props }"
       >
         <input-tooltip tooltip="Instance name.">
-          <v-text-field label="Name" v-model="name" v-bind="props" />
-        </input-tooltip>
-      </input-validator>
-
-      <input-validator
-        :value="username"
-        :rules="[
-          validators.required('Username is required.'),
-          validators.isLowercase('Username should consist of lowercase letters only.'),
-          validators.isAlphanumeric('Username should consist of letters and numbers only.'),
-          (username: string) => validators.isAlpha('Username must start with alphabet char.')(username[0]),
-          validators.minLength('Username must be at least 2 characters.', 2),
-          validators.maxLength('Username cannot exceed 50 characters.', 50),
-        ]"
-        #="{ props }"
-      >
-        <input-tooltip tooltip="Funkwhale admin username.">
-          <v-text-field label="Username" v-model="username" v-bind="props" />
+          <v-text-field label="Name/Username" v-model="name" v-bind="props" />
         </input-tooltip>
       </input-validator>
 
@@ -163,7 +146,6 @@ const profileManager = useProfileManager();
 const selectionDetails = ref<SelectionDetails>();
 
 const name = ref(generateName({ prefix: "fw" }));
-const username = ref("admin");
 const email = ref(profileManager.profile?.email || "");
 const password = ref(generatePassword(12));
 const solution = ref() as Ref<SolutionFlavor>;
@@ -235,7 +217,7 @@ async function deploy() {
             { key: "SSH_KEY", value: selectedSSHKeys.value },
             { key: "FUNKWHALE_HOSTNAME", value: domain },
             { key: "FUNKWHALE_SUPERUSER_EMAIL", value: email.value },
-            { key: "FUNKWHALE_SUPERUSER_NAME", value: username.value },
+            { key: "FUNKWHALE_SUPERUSER_NAME", value: name.value },
             { key: "FUNKWHALE_SUPERUSER_PASSWORD", value: password.value },
           ],
           nodeId: selectionDetails.value!.node!.nodeId,