Remove CoCalc

decmatt/.dshconfig

@@ -0,0 +1,6 @@
+azure:
+  admin_group_id: 347c68cb-261f-4a3e-ac3e-6af860b5fec9
+  location: uksouth
+  subscription_name: Data Safe Haven Development
+shm:
+  name: newtest

decmatt/newuser.csv

@@ -0,0 +1,2 @@
+GivenName,Surname,Phone,Email
+El,Vis,+447751185480,

decmatt/testuser.csv

@@ -0,0 +1,2 @@
+GivenName,Surname,Phone,Email
+Matt,Craddock,+447751185480,[email protected]

decmatt/wot.csv

@@ -0,0 +1,2 @@
+GivenName,Surname,Phone,Email
+El,Vis,+447751185480,

deployment/common/Configuration.psm1

@@ -729,7 +729,6 @@ function Get-SreConfig {
         }
     }
 
-
     # Firewall config
     # ---------------
     $config.sre.firewall = [ordered]@{
@@ -928,28 +927,10 @@ function Get-SreConfig {
     $config.sre.remoteDesktop.networkRules.includeAzurePlatformDnsRule = ($config.sre.remoteDesktop.networkRules.outboundInternet -ne "Allow")
 
 
-    # CoCalc, CodiMD and Gitlab servers
-    # ---------------------------------
+    # CodiMD and Gitlab servers
+    # -------------------------
     $config.sre.webapps = [ordered]@{
         rg     = "$($config.sre.rgPrefix)_WEBAPPS".ToUpper()
-        cocalc = [ordered]@{
-            adminPasswordSecretName = "$($config.sre.shortName)-vm-admin-password-cocalc"
-            dockerVersion           = "latest"
-            hostname                = "COCALC"
-            vmSize                  = "Standard_D2s_v3"
-            ip                      = Get-NextAvailableIpInRange -IpRangeCidr $config.sre.network.vnet.subnets.webapps.cidr -Offset 7
-            osVersion               = "Ubuntu-latest"
-            disks                   = [ordered]@{
-                data = [ordered]@{
-                    sizeGb = "512"
-                    type   = $config.sre.diskTypeDefault
-                }
-                os   = [ordered]@{
-                    sizeGb = "32"
-                    type   = $config.sre.diskTypeDefault
-                }
-            }
-        }
         codimd = [ordered]@{
             adminPasswordSecretName = "$($config.sre.shortName)-vm-admin-password-codimd"
             hostname                = "CODIMD"

deployment/secure_research_desktop/cloud_init/cloud-init-buildimage-ubuntu-1804.mustache.yaml

@@ -257,8 +257,6 @@ runcmd:
   # Get icons for webapps
   - echo "Downloading icons..."
   - mkdir -p /opt/icons
-  - wget https://raw.githubusercontent.com/sagemathinc/cocalc/master/src/packages/assets/cocalc-icon.svg -O /tmp/cocalc-icon.svg || die "Could not find CoCalc icon!"
-  - convert -density 983 -transparent white /tmp/cocalc-icon.svg /opt/icons/cocalc.png || die "Could not convert CoCalc icon!"  # this should give a 1024x1024 png
   - wget https://raw.githubusercontent.com/hackmdio/codimd/develop/public/favicon.png -O /opt/icons/codimd.png || die "Could not find CodiMD icon!"
   - wget https://about.gitlab.com/images/press/logo/png/gitlab-icon-rgb.png -O /opt/icons/gitlab.png || die "Could not find GitLab icon!"
 

deployment/secure_research_desktop/cloud_init/cloud-init-buildimage-ubuntu-2004.mustache.yaml

@@ -260,8 +260,6 @@ runcmd:
   # Get icons for webapps
   - echo "Downloading icons..."
   - mkdir -p /opt/icons
-  - wget https://raw.githubusercontent.com/sagemathinc/cocalc/master/src/packages/assets/cocalc-icon.svg -O /tmp/cocalc-icon.svg || die "Could not find CoCalc icon!"
-  - convert -density 983 -transparent white /tmp/cocalc-icon.svg /opt/icons/cocalc.png || die "Could not convert CoCalc icon!"  # this should give a 1024x1024 png
   - wget https://raw.githubusercontent.com/hackmdio/codimd/develop/public/favicon.png -O /opt/icons/codimd.png || die "Could not find CodiMD icon!"
   - wget https://about.gitlab.com/images/press/logo/png/gitlab-icon-rgb.png -O /opt/icons/gitlab.png || die "Could not find GitLab icon!"
 

deployment/secure_research_desktop/cloud_init/cloud-init-buildimage-ubuntu-2204.mustache.yaml

@@ -266,8 +266,6 @@ runcmd:
   # Get icons for webapps
   - echo "Downloading icons..."
   - mkdir -p /opt/icons
-  - wget https://raw.githubusercontent.com/sagemathinc/cocalc/master/src/packages/assets/cocalc-icon.svg -O /tmp/cocalc-icon.svg || die "Could not find CoCalc icon!"
-  - convert -density 983 -transparent white /tmp/cocalc-icon.svg /opt/icons/cocalc.png || die "Could not convert CoCalc icon!"  # this should give a 1024x1024 png
   - wget https://raw.githubusercontent.com/hackmdio/codimd/develop/public/favicon.png -O /opt/icons/codimd.png || die "Could not find CodiMD icon!"
   - wget https://about.gitlab.com/images/press/logo/png/gitlab-icon-rgb.png -O /opt/icons/gitlab.png || die "Could not find GitLab icon!"
 

deployment/secure_research_environment/cloud_init/cloud-init-srd.mustache.yaml

@@ -155,17 +155,6 @@ write_files:
           options(repos = r)
       })
 
-  - path: "/etc/skel/Desktop/CoCalc.desktop"
-    permissions: "0755"
-    content: |
-      [Desktop Entry]
-      Version=1.0
-      Type=Link
-      Name=CoCalc
-      Comment=
-      Icon=/opt/icons/cocalc.png
-      URL=https://{{sre.webapps.cocalc.fqdn}}
-
   - path: "/etc/skel/Desktop/CodiMD.desktop"
     permissions: "0755"
     content: |