diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm-ouh2/porter.yaml b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm-ouh2/porter.yaml index 34a4203..f611adb 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm-ouh2/porter.yaml +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm-ouh2/porter.yaml @@ -1,7 +1,7 @@ --- schemaVersion: 1.0.0 name: tre-service-guacamole-linuxvm-ouh2 -version: 1.0.5 +version: 1.0.6 description: "An Azure TRE User Resource Template for Guacamole (Linux)" dockerfile: Dockerfile.tmpl registry: azuretre diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm-ouh2/terraform/vm_config.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm-ouh2/terraform/vm_config.sh index 2cd59ca..c23ab70 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm-ouh2/terraform/vm_config.sh +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm-ouh2/terraform/vm_config.sh @@ -134,6 +134,54 @@ sudo echo -e "local({\n r <- getOption(\"repos\")\n r[\"Nexus\"] <- \"""${ # Fix for blank screen on DSVM (/sh -> /bash due to conflict with profile.d scripts) sudo sed -i 's|!/bin/sh|!/bin/bash|g' /etc/xrdp/startwm.sh +# Create the Desktop directory if it doesn't exist +sudo -u "$VM_USER" mkdir -p /home/"$VM_USER"/Desktop + +# Add a README file to the Desktop +README_PATH="/home/$VM_USER/Desktop/README.txt" +sudo -u "$VM_USER" bash -c "cat > $README_PATH" << 'EOF' +Welcome to your Linux VM! + +This VM is pre-configured with the following tools: +- XFCE Desktop Environment +- Azure Storage Explorer +- RStudio Desktop +- Docker +- Anaconda + +To get started: +1. Open any application using the Applications Menu. +2. Use RStudio or Jupyter Notebook for data analysis. +3. Access your shared file storage at /fileshares/vm-shared-storage (if configured). +4. See the package mirror options by accessing http://nexus-tvstre.uksouth.cloudapp.azure.com + +Recommendations: +1. R packages may fail to install initially. If you see an error, edit Rprofile to use the local package mirror: + +sudo nano /usr/lib/R/etc/Rprofile.site + +Replace the local(...) lines at the bottom with: +local({ + r <- getOption("repos") + r["Nexus"] <- "http://nexus-tvstre.uksouth.cloudapp.azure.com/repository/r-proxy/" + options(repos = r) +}) + +2. Disable XFCE Lock Screen otherwise you may get locked out: + +Open Applications > Settings > Screensaver; click on Lock Screen tab, disable the Lock Screen. + + +For further assistance, contact your administrator. + +Enjoy! +EOF + +# Set appropriate permissions for the README file +sudo chmod 644 "$README_PATH" +sudo chown "$VM_USER:$VM_USER" "$README_PATH" + + ### Anaconda Config if [ "${CONDA_CONFIG}" == "true" ]; then export PATH="/opt/anaconda/condabin":$PATH