From f8240ced6c0d5df457dd9e6b6625214cec0c5f22 Mon Sep 17 00:00:00 2001
From: aurreco-uga <aurreco@uga.edu>
Date: Wed, 13 Nov 2024 15:37:33 -0500
Subject: [PATCH] cleanup old irods-based user datasets workspace

---
 .../roles/conifer/vars/ClinEpi/default.yml    |  6 --
 .../vars/ClinEpi/production/default.yml       | 58 -------------------
 2 files changed, 64 deletions(-)

diff --git a/Model/lib/conifer/roles/conifer/vars/ClinEpi/default.yml b/Model/lib/conifer/roles/conifer/vars/ClinEpi/default.yml
index 4b6ab3f6..fb49da8d 100644
--- a/Model/lib/conifer/roles/conifer/vars/ClinEpi/default.yml
+++ b/Model/lib/conifer/roles/conifer/vars/ClinEpi/default.yml
@@ -30,9 +30,3 @@ modelconfig_oauthClientSecret: "{{ lookup('csvfile',
   }}"
 modelconfig_changePasswordUrl: "{{ modelconfig_oauthUrl }}/assets/eupathdb-changePassword.html?returnUrl={{ '{{' }}returnUrl}}&amp;suggestedUsername={{ '{{' }}suggestedUsername}}"
 
-modelconfig_userDatasetStoreConfig: >
-  <userDatasetStore implementation="org.gusdb.wdk.model.user.dataset.filesys.FilesysUserDatasetStore">
-    <property name="rootPath">/var/www/Common/workspaces/users</property>
-    <typeHandler type="ISA" version="0.0"
-      implementation="org.apidb.apicommon.model.userdataset.ISASimpleTypeHandler"/>
-  </userDatasetStore>
diff --git a/Model/lib/conifer/roles/conifer/vars/ClinEpi/production/default.yml b/Model/lib/conifer/roles/conifer/vars/ClinEpi/production/default.yml
index df8369c6..81095f31 100644
--- a/Model/lib/conifer/roles/conifer/vars/ClinEpi/production/default.yml
+++ b/Model/lib/conifer/roles/conifer/vars/ClinEpi/production/default.yml
@@ -85,64 +85,6 @@ community_env_map:
   b_prefix: static-content.veupathdb.org/
   default: qa.static-content.veupathdb.org/
 
-workspace_env_map:
-  b_prefix:
-    host: irods.eupathdb.org
-    login: wrkspuser
-    password: "{{ lookup('euparc',
-      'attr=password xpath=workspaces/irods[@user=\"{}\"]'.format('wrkspuser')
-      )
-    }}"
-    resource: ebrcResc
-    rootPath: /ebrc/workspaces/users
-    zone: ebrc
-    port: 1247
-  w_prefix:
-    host: irods.eupathdb.org
-    login: wrkspuser
-    password: "{{ lookup('euparc',
-      'attr=password xpath=workspaces/irods[@user=\"{}\"]'.format('wrkspuser')
-      )
-    }}"
-    resource: ebrcResc
-    rootPath: /ebrc/workspaces/users
-    zone: ebrc
-    port: 1247
-  default:
-    host: irods.qa.eupathdb.org
-    login: qawrkspuser
-    password: "{{ lookup('euparc',
-      'attr=password xpath=workspaces/irods[@user=\"{}\"]'.format('qawrkspuser')
-      )
-    }}"
-    resource: ebrcResc
-    rootPath: /ebrc/workspaces/users
-    zone: ebrc
-    port: 1247
-
-workspace_env: "{{ workspace_env_map[prefix]|default(workspace_env_map['default']) }}"
-
-modelconfig_userDatasetStoreConfig_irods_host: "{{ workspace_env['host'] }}"
-modelconfig_userDatasetStoreConfig_irods_login: "{{ workspace_env['login'] }}"
-modelconfig_userDatasetStoreConfig_irods_password: "{{ workspace_env['password'] }}"
-modelconfig_userDatasetStoreConfig_irods_resource: "{{ workspace_env['resource'] }}"
-modelconfig_userDatasetStoreConfig_irods_rootPath: "{{ workspace_env['rootPath'] }}"
-modelconfig_userDatasetStoreConfig_irods_zone: "{{ workspace_env['zone'] }}"
-modelconfig_userDatasetStoreConfig_irods_port: "{{ workspace_env['port'] }}"
-
-# The IrodsUserDatasetStore implementation is needed to connect to IRODS and list user datasets in WDK sites.
-modelconfig_userDatasetStoreConfig: >
-  <userDatasetStore implementation="org.gusdb.wdk.model.user.dataset.irods.IrodsUserDatasetStore">
-   <property name="login">{{ modelconfig_userDatasetStoreConfig_irods_login }}</property>
-   <property name="password">{{ modelconfig_userDatasetStoreConfig_irods_password }}</property>
-   <property name="host">{{ modelconfig_userDatasetStoreConfig_irods_host }}</property>
-   <property name="port">{{ modelconfig_userDatasetStoreConfig_irods_port }}</property>
-   <property name="resource">{{ modelconfig_userDatasetStoreConfig_irods_resource }}</property>
-   <property name="zone">{{ modelconfig_userDatasetStoreConfig_irods_zone }}</property>
-   <property name="rootPath">{{ modelconfig_userDatasetStoreConfig_irods_rootPath }}</property>    
-   <typeHandler type="ISA" version="0.0"  implementation="org.apidb.apicommon.model.userdataset.ISASimpleTypeHandler"/>
-  </userDatasetStore>
-
 eda:
   # Disable full screen apps for w sites, until they pass qa
   enableFullScreenApps: "{{ 'false' if prefix == 'w_prefix' else 'true' }}"