Switch Main to use build_sites.yml and upstream datatypes_conf.xml.sa…

…mple
galaxyproject · Feb 21, 2017 · 5187d5d · 5187d5d · jmchilton · Feb 21, 2017
1 parent 2554092
commit 5187d5d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 763 deletions.
diff --git 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
@@ -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"