Merge branch 'master' of adellam/ansible-roles into master

library/roles/thredds/defaults/main.yml

@@ -20,3 +20,6 @@ thredds_host_institution_name: 'ORG'
 thredds_host_institution_web: ''
 thredds_force_ssl_for_user_data: False
 thredds_palettes_customisation: False
+thredds_abstract: 'Scientific Data'
+thredds_contact_name: 'Support'
+thredds_google_analytics_key: ''

library/roles/thredds/tasks/main.yml

@@ -22,15 +22,23 @@
       register: thredds_skip_conf
       tags: [ 'thredds', 'tomcat', 'thredds_conf' ]
 
-    - name: Install the Thredds data configuration files
+    - name: Install the Thredds data configuration files -only at initialization-
       template: src={{ item[1] }}.j2 dest={{ thredds_data_content_dir }}/thredds/{{ item[1] }} owner={{ item.0.user }} group={{ item.0.user }} mode=644
       with_nested: 
         - '{{ tomcat_m_instances }}'      
-        - [ 'threddsConfig.xml', 'catalog.xml', 'wmsConfig.xml' ]        
+        - ['catalog.xml', 'wmsConfig.xml' ]        
       notify: tomcat instances restart
       when: not thredds_skip_conf.stat.exists
       tags: [ 'thredds', 'tomcat', 'thredds_conf' ]
 
+    - name: Install-update the Thredds data configuration files
+      template: src={{ item[1] }}.j2 dest={{ thredds_data_content_dir }}/thredds/{{ item[1] }} owner={{ item.0.user }} group={{ item.0.user }} mode=644
+      with_nested: 
+        - '{{ tomcat_m_instances }}'      
+        - [ 'threddsConfig.xml']        
+      notify: tomcat instances restart      
+      tags: [ 'thredds', 'tomcat', 'thredds_conf' ]
+
     - name: Create the file that states that the thredds instance has been configured
       copy: content="initialized by ansible" dest={{ thredds_data_content_dir }}/thredds/.conf_initialized mode=0400
       register: thredds_skip_conf

library/roles/thredds/templates/threddsConfig.xml.j2

@@ -6,13 +6,13 @@
   <serverInformation>
     <name>{{ thredds_server_name }}</name>
     <logoUrl>{{ thredds_logo_url }}</logoUrl>
-    <logoAltText>{{ thredds_server_name }}</logoAltText>
+    <logoAltText>{{ thredds_logo_alt_text }}</logoAltText>
 
-    <abstract>Scientific Data</abstract>
+    <abstract>{{ thredds_abstract }}</abstract>
     <keywords>meteorology, atmosphere, climate, ocean, earth science</keywords>
     
     <contact>
-      <name>Support</name>
+      <name>{{ thredds_contact_name}}</name>
       <organization>{{ thredds_organization }}</organization>
       <email>{{ thredds_email }}</email>
       <!--phone></phone-->
@@ -55,7 +55,7 @@
      * webpages associated with THREDDS. This will not track WMS or DAP
      * requests for data, only browsing the catalog.
     -->
-    <googleTrackingCode></googleTrackingCode>
+    <googleTrackingCode>{{ thredds_google_analytics_key }}</googleTrackingCode>
 
   </htmlSetup>