update

nwsde · Apr 25, 2024 · f1d68da · f1d68da
1 parent 060b6fd
commit f1d68da
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
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
@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-service-guacamole-linuxvm
-version: 0.6.34
+version: 0.6.35
 description: "An Azure TRE User Resource Template for Guacamole (Linux)"
 dockerfile: Dockerfile.tmpl
 registry: azuretre

diff --git a/...ervices/guacamole/user_resources/guacamole-azure-linuxvm/terraform/apt_sources_config.yml b/...ervices/guacamole/user_resources/guacamole-azure-linuxvm/terraform/apt_sources_config.yml
@@ -17,5 +17,4 @@ apt:
     deb [signed-by=/etc/apt/trusted.gpg.d/microsoft.gpg] ${nexus_proxy_url}/repository/microsoft-apt/ubuntu/${apt_sku}/prod $RELEASE main
     deb [signed-by=/etc/apt/trusted.gpg.d/microsoft.gpg] ${nexus_proxy_url}/repository/microsoft-apt/repos/edge stable main
     deb [signed-by=/etc/apt/trusted.gpg.d/microsoft.gpg] ${nexus_proxy_url}/repository/microsoft-apt/repos/vscode stable main
-    deb [signed-by=/etc/apt/trusted.gpg.d/microsoft.gpg] ${nexus_proxy_url}/repository/microsoft-apt/repos/azure-cli stable main
     deb [signed-by=/etc/apt/trusted.gpg.d/docker-archive-keyring.gpg] ${nexus_proxy_url}/repository/docker/ $RELEASE stable
diff --git a/...orkspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh b/...orkspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh
@@ -28,7 +28,7 @@ sudo apt install -y xfce4 xfce4-goodies xorg dbus-x11 x11-xserver-utils
 echo "init_vm.sh: xrdp"
 sudo apt install -y xrdp xorgxrdp xfce4-session
 sudo adduser xrdp ssl-cert
-sudo systemctl enable xrdp
+sudo -u "${VM_USER}" -i bash -c 'echo xfce4-session > ~/.xsession'
 
 ## Python 3.8 and Jupyter
 sudo apt install -y jupyter-notebook
@@ -38,8 +38,8 @@ echo "init_vm.sh: VS Code"
 sudo apt install -y code 
 sudo apt install -y gvfs-bin || contine
 
-echo "init_vm.sh: azure-cli"
-sudo apt install azure-cli -y
+# echo "init_vm.sh: azure-cli"
+# sudo apt install azure-cli -y
 
 # TODO: need to look at proxy extentions
 # echo "init_vm.sh: Folders"
@@ -70,8 +70,6 @@ sudo mkdir /opt/storage-explorer
 tar -xf /tmp/StorageExplorer-linux-x64.tar.gz -C /opt/storage-explorer
 sudo chmod +x /opt/storage-explorer/*.sh
 
-sudo -u "${VM_USER}" -i bash -c 'echo xfce4-session > ~/.xsession'
-
 # 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
 
@@ -152,10 +150,7 @@ sudo echo -e "local({\n    r <- getOption(\"repos\")\n    r[\"Nexus\"] <- \"""${
 ## Add ouh_researcher group for directory permissions
 echo "init_vm.sh: directory permissions"
 sudo chgrp -R ouh_researcher /opt/anaconda
-sudo chgrp -R ouh_researcher /opt/prom-tools
-
 sudo chmod -R g+w /opt/anaconda
-sudo chmod -R g+w /opt/prom-tools
 
 # ## Cleanup
 echo "init_vm.sh: Cleanup"