From 8cd9dd7919af06a33bdac9710c4a6f667575bbee Mon Sep 17 00:00:00 2001
From: starbr3aker <feyazabubaker@gmail.com>
Date: Sun, 12 Jan 2025 23:19:27 +0530
Subject: [PATCH] doc: default installation is via docker, changed files to
 reflect this.

---
 README.md      | 8 +++++++-
 compose.yaml   | 8 ++++----
 docs/docker.md | 2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index a060cd7..8e6a6ec 100644
--- a/README.md
+++ b/README.md
@@ -352,7 +352,7 @@ RDP_DOMAIN=""
 # - 'docker': '127.0.0.1'
 # - 'podman': '127.0.0.1'
 # - 'libvirt': '' (BLANK)
-RDP_IP=""
+RDP_IP="127.0.0.1"
 
 # [WINAPPS BACKEND]
 # DEFAULT VALUE: 'docker'
@@ -434,6 +434,12 @@ FREERDP_COMMAND=""
 > [!NOTE]
 > If you wish to use an alternative WinApps backend (other than `Docker`), uncomment and change `WAFLAVOR="docker"` to `WAFLAVOR="podman"` or `WAFLAVOR="libvirt"`.
 
+> [!NOTE]
+> If you encounter issues with tls certificate getting rejected, delete the existing `.pem` file with 
+> `rm -rf .config/freerdp/server/127.0.0.1_3389.pem` and run 
+> `xfreerdp3 /u:MyWindowsUser /p:MyWindowsPassword /v:127.0.0.1 /cert:tofu` 
+> to set up Trust On First Authentication. Then retry the `setup.sh` script.
+
 #### Configuration Options Explained
 - If using a pre-existing Windows RDP server on your LAN, you must use `RDP_IP` to specify the location of the Windows server. You may also wish to configure a static IP address for this server.
 - If running a Windows VM using `libvirt` with NAT enabled, leave `RDP_IP` commented out and WinApps will auto-detect the local IP address for the VM.
diff --git a/compose.yaml b/compose.yaml
index e9570d9..1fc3721 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -19,8 +19,8 @@ services:
       CPU_CORES: "4" # CPU cores allocated to the Windows VM.
       DISK_SIZE: "64G" # Size of the primary hard disk.
       #DISK2_SIZE: "32G" # Uncomment to add an additional hard disk to the Windows VM. Ensure it is mounted as a volume below.
-      #USERNAME: "Docker" # Uncomment to set a custom Windows username. The default is 'Docker'.
-      #PASSWORD: "" # Uncomment to set a password for the Windows user. There is no default password.
+      USERNAME: "MyWindowsUser" # Uncomment to set a custom Windows username. The default is 'Docker'.
+      PASSWORD: "MyWindowsPassword" # Uncomment to set a password for the Windows user. There is no default password.
       HOME: "${HOME}" # Set path to Linux user home folder.
     privileged: true # Grant the Windows VM extended privileges.
     ports:
@@ -37,5 +37,5 @@ services:
       #- /path/to/windows/install/media.iso:/custom.iso # Uncomment to use a custom Windows ISO. If specified, 'VERSION' (e.g. 'tiny11') will be ignored.
     devices:
       - /dev/kvm # Enable KVM.
-      #- /dev/sdX:/disk1 # Uncomment to mount a disk directly within the Windows VM (Note: 'disk1' will be mounted as the main drive).
-      #- /dev/sdY:/disk2 # Uncomment to mount a disk directly within the Windows VM (Note: 'disk2' and higher will be mounted as secondary drives).
+      #- /dev/sdX:/disk1 # Uncomment to mount a disk directly within the Windows VM (Note: 'disk1' will be mounted as the main drive. THIS DISK WILL BE FORMATTED DURING COMPOSE).
+      #- /dev/sdY:/disk2 # Uncomment to mount a disk directly within the Windows VM (Note: 'disk2' and higher will be mounted as secondary drives THIS DISK WILL NOT BE FORMATTED).
\ No newline at end of file
diff --git a/docs/docker.md b/docs/docker.md
index 308f364..9b61336 100644
--- a/docs/docker.md
+++ b/docs/docker.md
@@ -7,7 +7,7 @@ Although WinApps supports using `QEMU+KVM+libvirt` as a backend for running Wind
 > [!IMPORTANT]
 > WinApps does __NOT__ officially support versions of Windows prior to Windows 10. Despite this, it may be possible to achieve a successful installation with some additional experimentation. If you find a way to achieve this, please share your solution through a pull request for the benefit of other users.
 > Possible setup instructions for Windows 10:
-> - 'Professional', 'Enterprise' or 'Server' editions of Windows are required to run RDP applications. Windows 'Home' will NOT suffice. It is recommended to download the ISO from a reputed source, as the built in downloader (default set to `tiny11` will take longer than it would to download from a browser/torrent.
+> - 'Professional', 'Enterprise' or 'Server' editions of Windows are required to run RDP applications. Windows 'Home' will NOT suffice. It is recommended to download the ISO from a reputed source, as the built in downloader from dockur (default set to `tiny11`) will take longer than it would to download from a browser/torrent.
 > - It is recommended to edit the initial `compose.yaml` file to keep your required username and password from the beginning.
 > - It is recommended to not use `sudo` to force commands to run. Add your user to the relevant permissions group wherever possible.
 
-- 
GitLab