From 5187d5de7e15e6cb5f375f34e9473c606e6973e8 Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Tue, 21 Feb 2017 12:12:08 -0500 Subject: [PATCH] Switch Main to use build_sites.yml and upstream datatypes_conf.xml.sample --- production/group_vars/galaxyservers.yml | 7 +- .../usegalaxy.org/config/build_sites.yml.j2 | 16 + .../config/datatypes_conf.xml.j2 | 760 ------------------ 3 files changed, 20 insertions(+), 763 deletions(-) create mode 100644 templates/galaxy/usegalaxy.org/config/build_sites.yml.j2 delete mode 100644 templates/galaxy/usegalaxy.org/config/datatypes_conf.xml.j2 diff --git a/production/group_vars/galaxyservers.yml b/production/group_vars/galaxyservers.yml index 11ce958df..1f053b3e5 100644 --- a/production/group_vars/galaxyservers.yml +++ b/production/group_vars/galaxyservers.yml @@ -105,7 +105,8 @@ base_app_main: &BASE_APP_MAIN tool_sheds_config_file: "{{ galaxy_config_dir }}/tool_sheds_conf.xml" tool_data_table_config_path: "{{ galaxy_config_dir }}/tool_data_table_conf.xml,/cvmfs/data.galaxyproject.org/managed/location/tool_data_table_conf.xml" - datatypes_config_file: "{{ galaxy_config_dir }}/datatypes_conf.xml" + build_sites_config_file: "{{ galaxy_config_dir }}/build_sites.yml" + #datatypes_config_file: "{{ galaxy_config_dir }}/datatypes_conf.xml" object_store_config_file: "{{ galaxy_config_dir }}/object_store_conf.xml" job_config_file: "{{ galaxy_config_dir }}/job_conf.xml" job_resource_params_file: "{{ galaxy_config_dir }}/job_resource_params_conf.xml" @@ -271,8 +272,8 @@ galaxy_config_files: galaxy_config_templates: - src: templates/galaxy/{{ galaxy_instance_hostname }}/config/job_conf.xml.j2 dest: "{{ galaxy_config_dir }}/job_conf.xml" - - src: templates/galaxy/{{ galaxy_instance_hostname }}/config/datatypes_conf.xml.j2 - dest: "{{ galaxy_config['app:main']['datatypes_config_file'] }}" + - src: templates/galaxy/{{ galaxy_instance_hostname }}/config/build_sites.yml.j2 + dest: "{{ galaxy_config['app:main']['build_sites_config_file'] }}" - src: templates/galaxy/{{ galaxy_instance_hostname }}/config/reports.ini.j2 dest: "{{ galaxy_config_dir }}/reports.ini" - src: templates/galaxy/{{ galaxy_instance_hostname }}/config/uwsgi.ini.j2 diff --git a/templates/galaxy/usegalaxy.org/config/build_sites.yml.j2 b/templates/galaxy/usegalaxy.org/config/build_sites.yml.j2 new file mode 100644 index 000000000..9350e9baa --- /dev/null +++ b/templates/galaxy/usegalaxy.org/config/build_sites.yml.j2 @@ -0,0 +1,16 @@ +--- + +- type: ucsc + file: "{{ galaxy_config_dir }}/ucsc_build_sites.txt" + display: [main,archaea,ucla] +- type: gbrowse + file: "{{ galaxy_server_dir }}/tool-data/shared/gbrowse/gbrowse_build_sites.txt" + display: [wormbase,tair,modencode_worm,modencode_fly] +- type: ensembl + file: "{{ galaxy_server_dir }}/tool-data/shared/ensembl/ensembl_sites.txt" +- type: ensembl_data_url + file: "{{ galaxy_server_dir }}/tool-data/shared/ensembl/ensembl_sites_data_URL.txt" +- type: igv + file: "{{ galaxy_server_dir }}/tool-data/shared/igv/igv_build_sites.txt.sample" +- type: rviewer + file: "{{ galaxy_server_dir }}/tool-data/shared/rviewer/rviewer_build_sites.txt.sample" diff --git a/templates/galaxy/usegalaxy.org/config/datatypes_conf.xml.j2 b/templates/galaxy/usegalaxy.org/config/datatypes_conf.xml.j2 deleted file mode 100644 index b49305b52..000000000 --- a/templates/galaxy/usegalaxy.org/config/datatypes_conf.xml.j2 +++ /dev/null @@ -1,760 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -