diff --git a/thredds/defaults/main.yml b/thredds/defaults/main.yml
index 0d2dd49e..9ad026a1 100644
--- a/thredds/defaults/main.yml
+++ b/thredds/defaults/main.yml
@@ -3,9 +3,18 @@ thredds_install: False
thredds_upgrade: False
thredds_version: 4.6.9
thredds_name: tds
-thredds_app_name: thredds
-thredds_group_id: edu.ucar.tds
+thredds_app_name: Thredds
+thredds_group_id: edu.ucar
thredds_extension: war
thredds_file: '{{ thredds_name }}-{{ thredds_version }}.{{ thredds_extension }}'
thredds_repository_url: 'https://artifacts.unidata.ucar.edu/content/repositories/unidata-releases'
thredds_download_directory: /srv
+thredds_data_content_dir: /data/thredds
+thredds_public_netcdf_dir: '{{ thredds_data_content_dir }}/public/netcdf/'
+thredds_server_name: 'Thredds instance'
+thredds_logo_url: '/thredds/threddsIcon.gif'
+thredds_logo_alt_text: '{{ thredds_server_name }}'
+thredds_organization: 'ORG'
+thredds_email: ''
+thredds_host_institution_name: 'ORG'
+thredds_host_institution_web: ''
diff --git a/thredds/tasks/main.yml b/thredds/tasks/main.yml
index 7faf8c32..a94063a7 100644
--- a/thredds/tasks/main.yml
+++ b/thredds/tasks/main.yml
@@ -1,29 +1,33 @@
---
- block:
- name: Remove the Thredds webapp directory
- file: path={{ item.instance_path }}/webapps/{{ thredds_app_name }} state=absent
+ file: path={{ item.instance_path }}/webapps/{{ thredds_app_name | lower }} state=absent
with_items: '{{ tomcat_m_instances }}'
notify: tomcat instances restart
- - name: Remove the Thredds download and data directories
- file: path={{ item }} state=absent
- with_items:
- - '{{ thredds_download_directory }}'
- - '{{ thredds_data_directory }}'
-
when: not thredds_install or thredds_upgrade
tags: [ 'thredds', 'tomcat' ]
- block:
- name: Create the Thredds webapp directory
- file: path={{ item.instance_path }}/webapps/{{ thredds_app_name }} state=directory owner={{ item.user }} group={{ item.user }}
+ file: path={{ item.instance_path }}/webapps/{{ thredds_app_name | lower }} state=directory owner={{ item.user }} group={{ item.user }}
with_items: '{{ tomcat_m_instances }}'
+ - name: Create the Thredds data directory
+ file: path={{ thredds_data_content_dir }} state=directory owner={{ item.user }} group={{ item.user }}
+ with_items: '{{ tomcat_m_instances }}'
+
+ - name: Install the Thredds configuration files
+ template: src={{ item }}.j2 dest={{ thredds_data_content_dir }}/thredds/{{ item }} mode=444
+ with_items:
+ - threddsConfig.xml
+ - catalog.xml
+
- name: Get the thredds war file
maven_artifact: artifact_id={{ thredds_name }} version={{ thredds_version | default(omit) }} group_id={{ thredds_group_id }} extension={{ thredds_extension | default('war') }} repository_url={{ thredds_repository_url }} dest={{ thredds_download_directory }}/{{ thredds_file }}
- name: Unarchive the thredds war
- unarchive: copy=no src={{ smartgears_user_home }}/{{ thredds_file }} dest={{ item.instance_path }}/webapps/{{ thredds_app_name }} creates={{ item.instance_path }}/webapps/{{ thredds_app_name }}/WEB-INF/lib owner={{ item.user }} group={{ item.user }}
+ unarchive: copy=no src={{ thredds_download_directory }}/{{ thredds_file }} dest={{ item.instance_path }}/webapps/{{ thredds_app_name | lower }} creates={{ item.instance_path }}/webapps/{{ thredds_app_name | lower }}/WEB-INF/lib owner={{ item.user }} group={{ item.user }}
with_items: '{{ tomcat_m_instances }}'
notify: tomcat instances restart
diff --git a/thredds/templates/catalog.xml.j2 b/thredds/templates/catalog.xml.j2
new file mode 100644
index 00000000..5d476f68
--- /dev/null
+++ b/thredds/templates/catalog.xml.j2
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ all
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/thredds/templates/threddsConfig.xml.j2 b/thredds/templates/threddsConfig.xml.j2
new file mode 100644
index 00000000..2001d53a
--- /dev/null
+++ b/thredds/templates/threddsConfig.xml.j2
@@ -0,0 +1,271 @@
+
+
+
+
+
+
+ {{ thredds_server_name }}
+ {{ thredds_logo_url }}
+ {{ thredds_server_name }}
+
+ Scientific Data
+ meteorology, atmosphere, climate, ocean, earth science
+
+
+ Support
+ {{ thredds_organization }}
+ {{ thredds_email }}
+
+
+
+ {{ thredds_host_institution_name }}
+ {{ thredds_host_institution_web }}
+
+
+
+
+
+
+
+
+ tds.css
+ tdsCat.css
+ tdsDap.css
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ false
+ 15 min
+ 30 min
+
+
+
+
+
+ true
+ false
+ 2048
+ 2048
+
+
+
+
+
+ true
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+