Merge pull request #730 from threefoldtech/development

dev to master periodic update

src/documentation/farmers/3node_building/1_create_farm.md

@@ -2,75 +2,30 @@
 
 ## Introduction
 
-We cover the basic steps to create a farm with the ThreeFold Dashboard. We also create a TFConnect app wallet to receive the farming rewards. 
+We cover the basic steps to create a farm with the ThreeFold Connect app. We also show how to connect the farm to the ThreeFold Dashboard. 
 
-## Create a TFChain Account
+## Create a ThreeFold Connect App Account
 
-We create a TFChain account using the ThreeFold Dashboard.
-
-Go to the [ThreeFold Dashboard](https://dashboard.grid.tf/), click on **Create Account**, choose a password and click **Connect**.
-
-![tfchain_create_account](./img/dashboard_tfchain_create_account.png)
-
-Once your profile gets activated, you should find your Twin ID and Address generated under your Mnemonics for verification. Also, your Account Balance will be available at the top right corner under your profile name.
-
-![tf_mnemonics](./img/dashboard_tf_mnemonics.png)
+Follow the steps in the [TF Connect App section](../../tfconnect/tfconnect_installation.md) to create an account. 
 
 ## Create a Farm
 
-We create a farm using the dashboard.
-
-In the left-side menu, select **Farms** -> **Your Farms**.
-
-![your_farms](./img/dashboard_your_farms.png)
-
-Click on **Create Farm**, choose a farm name and then click **Create**.
-
-![create_farm](./img/dashboard_create_farm.png)
-
-![farm_name](./img/dashboard_farm_name.png)
-
-## Create a ThreeFold Connect Wallet
-
-Your farming rewards should be sent to a Stellar wallet with a TFT trustline enabled. The simplest way to proceed is to create a TF Connect app wallet as the TFT trustline is enabled by default on this wallet. For more information on TF Connect, read [this section](../../threefold_token/storing_tft/tf_connect_app.md).
+Open the TF Connect app, go to Farming and click on the plus button `+` to create a farm.
 
-Let's create a TFConnect Wallet and take note of the wallet address. First, download the app.
+Choose a farm name and select a wallet then click `Create`.
 
-This app is available for [Android](https://play.google.com/store/apps/details?id=org.jimber.threebotlogin&hl=en&gl=US) and [iOS](https://apps.apple.com/us/app/threefold-connect/id1459845885).
+![](./img/tfconnect_farm2.jpg)
 
-- Note that for Android phones, you need at minimum Android Nougat, the 8.0 software version.
-- Note that for iOS phones, you need at minimum iOS 14.5. It will be soon available to iOS 13.
+## Import the Farm on the Dashboard (Optional)
 
-Open the app, click **SIGN UP**, choose a ThreeFold Connect Id, write your email address, take note of the seed phrase and choose a pin. Once this is done, you will have to verify your email address. Check your email inbox.
+To import the farm on the Dashboard, go to the farming section of the TF Connect App, click on the farm then copy the `TFChain Secret`.
 
-In the app menu, click on **Wallet** and then click on **Create Initial Wallet**.
+![](./img/tfconnect_farm.jpg)
 
-To find your wallet address, click on the **circled i** icon at the bottom of the screen.
+Use this secret to import a wallet on the [ThreeFold Dashboard](https://dashboard.grid.tf).
 
-![dashboard_tfconnect_wallet_1](./img/dashboard_tfconnect_wallet_1.png)
-
-Click on the button next to your Stellar address to copy the address.
-
-![dashboard_tfconnect_wallet_2](./img/dashboard_tfconnect_wallet_2.png)
-
-You will need the TF Connect wallet address for the next section.
-
-> Note: Make sure to keep your TF Connect Id and seed phrase in a secure place offline. You will need these two components to recover your account if you lose access.
-
-## Add a Stellar Address for Payout
-
-In the **Your Farms** section of the dashboard, click on **Add/Edit Stellar Payout Address**.
-
-![dashboard_walletaddress_1](./img/dashboard_walletaddress_1.png)
-
-Paste your Stellar wallet address and click **Submit**.
-
-![dashboard_walletaddress_2](./img/dashboard_walletaddress_2.png)
+Consult the [ThreeFold Dashboard section](../../dashboard/dashboard.md) for more information on the dashboard.
 
 ### Farming Rewards Distribution
 
-Farming rewards will be sent to your farming wallet around the 8th of each month. This can vary depending on the situation. The minting is done automatically by code and verified by humans as a double check.
-
-## More Information
-
-For more information, such as setting IP addresses, you can consult the [Dashboard Farms section](../../dashboard/farms/farms.md).
+Farming rewards will be sent to your farming wallet around the 8th of each month. This can vary depending on the situation. The minting is done automatically by code and verified by humans as a double check.

src/documentation/system_administrators/advanced/grid3_redis.md

@@ -14,7 +14,7 @@ Redis is widely used in various use cases, including caching, session management
 
 ### Linux
 
-If you don't find Redis in your Linux distro's package manager, check the [Redis downloads](https://redis.io/download) page for the source code and installation instructions.
+If you don't find Redis in your Linux distro's package manager, check the [Redis downloads](https://redis.io/downloads/) page for the source code and installation instructions.
 
 ### MacOS
 
@@ -25,7 +25,7 @@ brew update
 brew install redis
 ```
 
-Alternatively, it can be built from source, using the same [download page](https://redis.io/download/) as shown above.
+Alternatively, it can be built from source, using the same [download page](https://redis.io/downloads/) as shown above.
 
 
 

src/documentation/system_administrators/getstarted/remote-desktop_gui/xrdp_guide/xrdp_guide.md

@@ -18,7 +18,7 @@ If you are new to the Threefold ecosystem and you want to deploy workloads on th
 ## Server Side: Deploy the Full VM, install a desktop and XRDP
 
 * Go to the [Threefold Dashboard](https://dashboard.grid.tf/#/)
-* Deploy a full VM (Ubuntu 20.04)
+* Deploy a full VM (Ubuntu 24.04)
   * With an IPv4 Address
 * After deployment, copy the IPv4 address
 * To SSH into the VM, write in the terminal
@@ -28,12 +28,17 @@ If you are new to the Threefold ecosystem and you want to deploy workloads on th
 * Once connected, update, upgrade and install the desktop environment
   * Update
     * ```
-      sudo apt update -y && sudo apt upgrade -y
+      apt update && apt install nano -y && apt upgrade -y
       ```  
-  * Install a light-weight desktop environment (Xfce)
-    * ```
-      sudo apt install xfce4 xfce4-goodies -y
-      ```
+  * You can install XCFE, a lightweight desktop environment or Ubuntu Desktop (choose either one)
+    * Install XCFE
+      * ```
+        apt install xrdp xfce4 xfce4-goodies -y
+        ```
+    * Install Ubuntu Desktop
+      * ```
+        apt install xrdp ubuntu-desktop -y
+        ```
 * Create a user with root access
     * ``` 
       adduser newuser
@@ -46,6 +51,12 @@ If you are new to the Threefold ecosystem and you want to deploy workloads on th
       * ```
         usermod -aG sudo newuser
         ```
+    * Update the setuid for root
+      * ```
+        chown root:root /usr/bin/sudo
+        chmod 4755 /usr/bin/sudo
+        ls -l /usr/bin/sudo
+        ```
     * Make newuser accessible by SSH
       * ```
         su - newuser
@@ -56,53 +67,62 @@ If you are new to the Threefold ecosystem and you want to deploy workloads on th
       * ```
         nano ~/.ssh/authorized_keys
         ```
-        * add authorized public key in file and save
+        * Add the authorized public key and save the file
   * Exit the VM and reconnect with new user
     * ```
       exit
       ```
-* Reconnect to the VM terminal and install XRDP
+* Reconnect to the VM terminal with newuser
     * ``` 
       ssh newuser@VM_IPv4_address
       ```
-* Install XRDP
-  * ```
-    sudo apt install xrdp -y
-    ```
 * Check XRDP status 
   * ```
     sudo systemctl status xrdp
     ```
-  * If not running, run manually:
+  * If not running, run manually (this also makes sure xrdp runs at every restart of the VM)
     * ```
-      sudo systemctl start xrdp
+      sudo systemctl enable --now xrdp
       ```
 * If needed, configure xrdp (optional)
   * ```
     sudo nano /etc/xrdp/xrdp.ini
     ```
 * Create a session with root-access user
-Move to home directory
   * Go to home directory of root-access user
     * ```
       cd ~
       ```
-* Create session
-  * ``` 
-    echo "xfce4-session" | tee .xsession
-    ```
-* Restart the server
+* Create a desktop session
+  * For XCFE
+    * ``` 
+        echo "xfce4-session" | tee .xsession
+        ```
+  * For Ubuntu desktop
+    * ``` 
+        echo "gnome-session" | tee .xsession
+        ```
+* Reload the daemon and restart xrdp
   * ```
+    sudo systemctl daemon-reload
     sudo systemctl restart xrdp
     ```
 
+### Set Firewall (Optional)
+
+You can set a firewall, but this is optional.
+
 * Find your local computer IP address
   * On your local computer terminal, write
     * ```
       curl ifconfig.me
       ```
 
-* On the VM terminal, allow client computer port to the firewall (ufw)
+* On the VM terminal, install ufw
+  * ```
+    sudo apt install ufw -y
+    ```
+* Allow client computer port to the firewall (ufw)
   * ```
     sudo ufw allow from your_local_ip/32 to any port 3389
     ```

src/knowledge_base/releasenotes/tfgrid_release_3_0_a2.md

@@ -96,14 +96,14 @@ TODO
 
 Following list is incomplete but gives some issues to think about.
 
-- Weblets [limitations](https://library.threefold.me/info/manual/#/manual__weblets_home?id=limitations)
+- Weblets limitations
 - QSFS integration is a work in progress
 - ZOS and SSD performance [issue](https://github.com/threefoldtech/zos/issues/1467)
 - Threefold Connect having [issues](https://circles.threefold.me/project/test-tfgrid3/issue/52) 
 - Docker & ZOS containers [differences](https://github.com/threefoldtech/zos/issues/1483)
 - ZOS workloads upgrade [issue](https://github.com/threefoldtech/zos/issues/1425)
 - Terraform projects [don't reflect in the weblets](https://github.com/threefoldtech/terraform-provider-grid/issues/146)
-- Can't detach public IP from a VM and removing it from a contract [issue](https://github.com/threefoldtech/tfchain_pallets/issues/73), please note you can still create each in separate contracts.
+- Can't detach public IP from a VM and removing it from a contract [issue](https://github.com/threefoldtech/tfchain/issues/175), please note you can still create each in separate contracts.
 
 # ThreeFold Release Notes TFGrid 3.0.0 Alpha 1 (Live on mainnet)
 
@@ -193,12 +193,12 @@ TODO
 
 Following list is incomplete but gives some issues to think about.
 
-- Weblets [limitations](https://library.threefold.me/info/manual/#/manual__weblets_home?id=limitations)
+- Weblets limitations
 - Public IP6 [support](https://github.com/threefoldtech/zos/pull/1488) in ZOS
 - QSFS integration is a work in progress
 - ZOS and SSD performance [issue](https://github.com/threefoldtech/zos/issues/1467)
 - Threefold Connect having [issues](https://circles.threefold.me/project/test-tfgrid3/issue/52) 
 - Docker & ZOS containers [differences](https://github.com/threefoldtech/zos/issues/1483)
 - ZOS workloads upgrade [issue](https://github.com/threefoldtech/zos/issues/1425)
 - Terraform projects [don't reflect in the weblets](https://github.com/threefoldtech/terraform-provider-grid/issues/146)
-- Can't detach public IP from a VM and removing it from a contract [issue](https://github.com/threefoldtech/tfchain_pallets/issues/73), please note you can still create each in separate contracts.
+- Can't detach public IP from a VM and removing it from a contract [issue](https://github.com/threefoldtech/tfchain/issues/175), please note you can still create each in separate contracts.