diff --git a/Inventory/group_vars/all b/Inventory/group_vars/all index b79ab1efa4ca435e899921aa84237e451c0938bd..706bd72337797e7fc464df371111dbb20b511f30 100644 --- a/Inventory/group_vars/all +++ b/Inventory/group_vars/all @@ -1,27 +1,27 @@ --- gensoft_packs: - - {name: beast, vers: 'v2.6.2'} - - {name: beagle, vers: '5.1'} - - {name: bmge, vers: '1.12'} - - {name: clustal-omega, vers: '1.2.4'} - - {name: clustalw, vers: '2.1'} - - {name: fastme, vers: '2.1.6.1'} - - {name: figtree, vers: '1.4.4'} - - {name: goalign, vers: '0.3.5'} - - {name: gotree, vers: '0.4.2'} - - {name: gblocks, vers: '0.91b'} - - {name: iq-tree, vers: '2.0.6'} - - {name: jmodeltest2, vers: '2.1.10'} - - {name: lsd2, vers: '1.9.7'} - - {name: mafft, vers: '7.467'} - - {name: mrbayes, vers: '3.2.7'} - - {name: msaprobs, vers: '1.0.5'} - - {name: paml, vers: '4.9j'} - - {name: phylip, vers: '3.67'} - - {name: phyml, vers: '3.3.20190909'} - - {name: raxml, vers: '8.2.12'} - - {name: raxml-ng, vers: '1.0.1'} - - {name: seaview, vers: '5.0.1'} - - {name: tracer, vers: 'v1.7.1'} - - {name: treetime, vers: '0.7.4'} + - {name: beast, module: beast, vers: 'v2.6.2'} + - {name: beagle, module: beagle, vers: '5.1'} + - {name: bmge, module: BMGE, vers: '1.12'} + - {name: clustal-omega, module: Clustal-omega, vers: '1.2.4'} + - {name: clustalw, module: ClustalW, vers: '2.1'} + - {name: fastme, module: fastme, vers: '2.1.6.1'} + - {name: figtree, module: FigTree, vers: '1.4.4'} + - {name: goalign, module: goalign, vers: '0.3.5'} + - {name: gotree, module: gotree, vers: '0.4.2'} + - {name: gblocks, module: gblocks, vers: '0.91b'} + - {name: iq-tree, module: IQ-TREE, vers: '2.0.6'} + - {name: jmodeltest2, module: jmodeltest2, vers: '2.1.10'} + - {name: lsd2, module: lsd2, vers: '1.9.7'} + - {name: mafft, module: mafft, vers: '7.467'} + - {name: mrbayes, module: mrbayes, vers: '3.2.7'} + - {name: msaprobs, module: msaprobs, vers: '1.0.5'} + - {name: paml, module: paml, vers: '4.9j'} + - {name: phylip, module: phylip, vers: '3.67'} + - {name: phyml, module: phyml, vers: '3.3.20190909'} + - {name: raxml, module: raxml, vers: '8.2.12'} + - {name: raxml-ng, module: raxml-ng, vers: '1.0.1'} + - {name: seaview, module: seaview, vers: '5.0.1'} + - {name: tracer, module: Tracer, vers: 'v1.7.1'} + - {name: treetime, module: treetime, vers: '0.7.4'} diff --git a/roles/gensoft/templates/etc/profile.d/gensoft_load.j2 b/roles/gensoft/templates/etc/profile.d/gensoft_load.j2 index 0d956662e45bdbb054f253c6c623530893607917..74088d8e0c9608882f26101e6f63c08e830809d0 100644 --- a/roles/gensoft/templates/etc/profile.d/gensoft_load.j2 +++ b/roles/gensoft/templates/etc/profile.d/gensoft_load.j2 @@ -4,12 +4,12 @@ if [[ ${EUID} -ne 0 ]]; then - source /local/gensoft2/adm/etc/profile.d/modules.sh + source /opt/gensoft/adm/etc/profile.d/modules.sh AUTOLOADMODULE=1 export AUTOLOADMODULE {% for pack in gensoft_packs %} - module load {{ pack.name }} + module load --silent {{ pack.module }} {% endfor %} fi \ No newline at end of file