Merge pull request #427 from threefoldtech/development_peertube_updates

update peertube weblet with the min requirements

Author: abom

src/elements/peertube/Peertube.wc.svelte

@@ -5,7 +5,8 @@
   import type { IFormField, ITab } from "../../types";
   import type { IProfile } from "../../types/Profile";
   // Modules
-  import VM, { Disk, Env } from "../../types/vm";
+  import { Disk, Env } from "../../types/vm";
+  import Peertube from "../../types/peertube";
   import deployPeertube from "../../utils/deployPeertube";
   // Components
   import SelectProfile from "../../components/SelectProfile.svelte";
@@ -22,6 +23,7 @@
     validateCpu,
     validateDisk,
     validateMemory,
+    validateEmail,
   } from "../../utils/validateName";
   import { noActiveProfile } from "../../utils/message";
   import rootFs from "../../utils/rootFs";
@@ -30,11 +32,14 @@
 
   const tabs: ITab[] = [{ label: "Base", value: "base" }];
   const nameField: IFormField = { label: "Name", placeholder: "Peertube Instance Name", symbol: "name", type: "text", validator: validateName, invalid: false }; // prettier-ignore
+  const emailField: IFormField = { label: "Email", placeholder: "Instance Admin Email", symbol: "email", type: "text", validator: validateEmail, invalid: false }; // prettier-ignore
+  const passField: IFormField = { label: "Password", placeholder: "Instance Admin Password", symbol: "password", type: "password", invalid: false }; // prettier-ignore
 
   // prettier-ignore
   const baseFields: IFormField[] = [
     { label: "CPU", symbol: "cpu", placeholder: "CPU Cores", type: "number", validator: validateCpu, invalid: false },
-    { label: "Memory (MB)", symbol: "memory", placeholder: "Your Memory in MB", type: "number", validator: validateMemory, invalid: false }
+    { label: "Memory (MB)", symbol: "memory", placeholder: "Your Memory in MB", type: "number", validator: validateMemory, invalid: false },
+    { label: "Public IP", symbol: "publicIp", placeholder: "", type: 'checkbox' },
   ];
 
   const diskField: IFormField = {
@@ -47,10 +52,7 @@
   };
 
   const deploymentStore = window.configs?.deploymentStore;
-  let data = new VM(); // set the default specs for peertube
-  data.cpu = 2;
-  data.memory = 2048;
-  data.disks = [new Disk(undefined, undefined, 20, undefined)];
+  let data = new Peertube();
 
   let active: string = "base";
   let loading = false;
@@ -135,6 +137,17 @@
           bind:invalid={nameField.invalid}
           field={nameField}
         />
+        <Input
+          bind:data={data.adminEmail}
+          bind:invalid={emailField.invalid}
+          field={emailField}
+        />
+        <Input
+          bind:data={data.adminPassword}
+          bind:invalid={passField.invalid}
+          field={passField}
+        />
+        <Input bind:data={data.disks[0].size} field={diskField} />
 
         {#each baseFields as field (field.symbol)}
           {#if field.invalid !== undefined}
@@ -147,10 +160,9 @@
             <Input bind:data={data[field.symbol]} {field} />
           {/if}
         {/each}
-        <Input bind:data={data.disks[0].size} field={diskField} />
 
         <SelectNodeId
-          publicIp={false}
+          publicIp={data.publicIp}
           cpu={data.cpu}
           memory={data.memory}
           ssd={data.disks.reduce(

src/types/peertube.ts

@@ -0,0 +1,13 @@
+import generatePassword from "../utils/generatePassword";
+import VM, { Disk } from "./vm";
+import { v4 } from "uuid";
+
+export default class Peertube extends VM {
+  public name = `pt${v4().split("-")[0]}`;
+  public adminEmail = "";
+  public adminPassword = generatePassword((length = Math.floor(Math.random() * 5) + 10)); // prettier-ignore
+  public publicIp = false;
+  public cpu = 2;
+  public memory = 1024 * 2;
+  public disks = [new Disk(undefined, undefined, 20, undefined)];
+}

src/utils/deployPeertube.ts

@@ -1,4 +1,4 @@
-import type { default as VM } from "../types/vm";
+import type { default as Peertube } from "../types/peertube";
 import type { IProfile } from "../types/Profile";
 import deploy from "./deploy";
 
@@ -17,10 +17,15 @@ const {
   generateString,
 } = window.configs?.grid3_client ?? {};
 
-export default async function deployPeertube(data: VM, profile: IProfile) {
+export default async function deployPeertube(
+  data: Peertube,
+  profile: IProfile
+) {
   const {
     envs,
     disks: [{ size }],
+    adminEmail,
+    adminPassword,
     ...base
   } = data;
   let { name, flist, cpu, memory, entrypoint, network: nw } = base;
@@ -64,7 +69,10 @@ export default async function deployPeertube(data: VM, profile: IProfile) {
     memory,
     size,
     sshKey,
-    randomSuffix
+    randomSuffix,
+    publicIp,
+    adminEmail,
+    adminPassword
   );
 
   // get the info of peertube deployment
@@ -103,7 +111,10 @@ async function deployPeertubeVM(
   memory: number,
   diskSize: number,
   sshKey: string,
-  randomSuffix: string
+  randomSuffix: string,
+  publicIp: boolean,
+  email: string,
+  password: string
 ) {
   // disk
   const disk = new DiskModel();
@@ -116,17 +127,18 @@ async function deployPeertubeVM(
   vm.name = `vm${randomSuffix}`;
   vm.node_id = nodeId;
   vm.disks = [disk];
-  vm.public_ip = false;
+  vm.public_ip = publicIp;
   vm.planetary = true;
   vm.cpu = cpu;
   vm.memory = memory;
   vm.rootfs_size = rootFs(cpu, memory);
   vm.flist =
-    "https://hub.grid.tf/tf-official-apps/threefoldtech-peertube-v3.0.flist";
+    "https://hub.grid.tf/omarabdul3ziz.3bot/threefoldtech-peertube-v3.1.flist";
   vm.entrypoint = "/usr/local/bin/entrypoint.sh";
   vm.env = {
     SSH_KEY: sshKey,
-    PEERTUBE_ADMIN_EMAIL: "[email protected]",
+    PEERTUBE_ADMIN_EMAIL: email,
+    PT_INITIAL_ROOT_PASSWORD: password,
     PEERTUBE_WEBSERVER_HOSTNAME: domain,
     PEERTUBE_WEBSERVER_PORT: "443",
     PEERTUBE_DB_SUFFIX: "_prod",
@@ -145,11 +157,10 @@ async function deployPeertubeVM(
     return grid.machines
       .deploy(vms)
       .then(async () => {
-        for(const gw of await grid.gateway._list()){
+        for (const gw of await grid.gateway._list()) {
           try {
             await grid.gateway.getObj(gw);
-          }
-          catch {}
+          } catch {}
         }
       })
       .then(() => grid.machines.getObj(name))