From 004a9c0a15e91e1fdc08acf6a3d41b2fe88d52cd Mon Sep 17 00:00:00 2001
From: tim-allen-ck <tim.allen@cloudkubed.com>
Date: Tue, 7 May 2024 10:27:09 +0100
Subject: [PATCH] update script

---
 .../shared_services/sonatype-nexus-vm/porter.yaml     |  2 +-
 .../guacamole-azure-linuxvm/porter.yaml               | 11 +----------
 .../guacamole-azure-linuxvm/terraform/vm_config.sh    |  6 +++++-
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/templates/shared_services/sonatype-nexus-vm/porter.yaml b/templates/shared_services/sonatype-nexus-vm/porter.yaml
index f5340a3bc5..f46a419468 100644
--- a/templates/shared_services/sonatype-nexus-vm/porter.yaml
+++ b/templates/shared_services/sonatype-nexus-vm/porter.yaml
@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-shared-service-sonatype-nexus
-version: 2.8.19
+version: 3.0.0
 description: "A Sonatype Nexus shared service"
 dockerfile: Dockerfile.tmpl
 registry: azuretre
diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/porter.yaml b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/porter.yaml
index 3c074cf9bb..d73bb38d1c 100644
--- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/porter.yaml
+++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/porter.yaml
@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-service-guacamole-linuxvm
-version: 0.6.51
+version: 1.0.0
 description: "An Azure TRE User Resource Template for Guacamole (Linux)"
 dockerfile: Dockerfile.tmpl
 registry: azuretre
@@ -23,15 +23,6 @@ custom:
         apt_sku: 22.04
       install_ui: true
       conda_config: false
-    "Ubuntu 20.04 LTS":
-      source_image_reference:
-        publisher: canonical
-        offer: 0001-com-ubuntu-server-focal
-        sku: 20_04-lts-gen2
-        version: latest
-        apt_sku: 20.04
-      install_ui: false
-      conda_config: false
     "Ubuntu 20.04 LTS Data Science VM":
       source_image_reference:
         publisher: microsoft-dsvm
diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh
index 773f57172b..e88a523e5e 100644
--- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh
+++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh
@@ -164,7 +164,7 @@ sudo echo -e "local({\n    r <- getOption(\"repos\")\n    r[\"Nexus\"] <- \"""${
 # Jupiter Notebook Config
 sudo sed -i -e 's/Terminal=true/Terminal=false/g' /usr/share/applications/jupyter-notebook.desktop
 
-#Default Browser
+# Default Browser
 sudo update-alternatives --config x-www-browser
 
 ## Cleanup
@@ -172,6 +172,10 @@ echo "init_vm.sh: Cleanup"
 sudo shutdown -r now
 
 # Prevent screen timeout 
+echo "init_vm.sh: Preventing Timeout"
+sudo touch /home/${VM_USER}/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-screensaver.xml
+sudo chmod 664 /home/${VM_USER}/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-screensaver.xml
+sudo chown ${VM_USER}:${VM_USER} /home/${VM_USER}/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-screensaver.xml
 sudo tee /home/${VM_USER}/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-screensaver.xml << END
 <?xml version="1.0" encoding="UTF-8"?>
 <channel name="xfce4-screensaver" version="1.0">