Merge branch 'master' into enable/gxadmin_galaxy_cleanup

Author: gsaudade99

.github/workflows/tpv.yml

@@ -26,6 +26,7 @@ jobs:
         run: |
           rm -f group_vars/htcondor/vault.yml
           rm -f group_vars/htcondor-secondary/vault.yml
+          rm -f group_vars/all/ssh-keys_vault.yml
 
       - name: Update git submodules.
         working-directory: "infrastructure-playbook"
@@ -177,6 +178,7 @@ jobs:
         run: |
           rm -f group_vars/htcondor/vault.yml
           rm -f group_vars/htcondor-secondary/vault.yml
+          rm -f group_vars/all/ssh-keys_vault.yml
 
       - name: Update git submodules.
         working-directory: "infrastructure-playbook"

files/galaxy/tpv/users.yml

@@ -8,7 +8,6 @@ users:
           'interactive_tool_jupyter_notebook' in tool.id
         cores: 1
         mem: 15
-  [email protected]:
   [email protected]:
     rules:
       - id: user-specific-notebook