From 9985904b69494f11378747c2faaa1463e7416226 Mon Sep 17 00:00:00 2001 From: vjrj Date: Tue, 14 Apr 2020 23:07:25 +0200 Subject: [PATCH] Set output_encoding to iso-8859-1 for properties configs --- ansible/roles/bie-hub/tasks/main.yml | 2 +- ansible/roles/biocache-hub/tasks/main.yml | 4 ++-- ansible/roles/biocache-properties/tasks/main.yml | 2 +- ansible/roles/collectory/tasks/main.yml | 2 +- ansible/roles/dashboard/tasks/main.yml | 2 +- ansible/roles/logger-service/tasks/main.yml | 2 +- ansible/roles/regions/tasks/main.yml | 2 +- ansible/roles/species-list/tasks/main.yml | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ansible/roles/bie-hub/tasks/main.yml b/ansible/roles/bie-hub/tasks/main.yml index 6978913ae..37b25480f 100644 --- a/ansible/roles/bie-hub/tasks/main.yml +++ b/ansible/roles/bie-hub/tasks/main.yml @@ -13,7 +13,7 @@ - bie - name: copy all config.properties - template: src=bie-hub-config.properties dest={{ data_dir }}/{{ bie_hub | default('generic-bie') }}/config/{{ bie_hub | default('generic-bie') }}-config.properties force=yes + template: src=bie-hub-config.properties dest={{ data_dir }}/{{ bie_hub | default('generic-bie') }}/config/{{ bie_hub | default('generic-bie') }}-config.properties force=yes output_encoding=iso-8859-1 tags: - webapps - properties diff --git a/ansible/roles/biocache-hub/tasks/main.yml b/ansible/roles/biocache-hub/tasks/main.yml index 567cc6673..e878812d7 100644 --- a/ansible/roles/biocache-hub/tasks/main.yml +++ b/ansible/roles/biocache-hub/tasks/main.yml @@ -15,7 +15,7 @@ - webapps - apache_vhost - deploy - - biocache_hub + - biocache_hub when: not webserver_nginx - name: add nginx vhost if configured @@ -99,7 +99,7 @@ - facets_config - name: copy all config.properties - template: src=config/config.properties dest={{data_dir}}/{{biocache_hub}}/config/{{biocache_hub_config}} force=yes + template: src=config/config.properties dest={{data_dir}}/{{biocache_hub}}/config/{{biocache_hub_config}} force=yes output_encoding=iso-8859-1 tags: - webapps - properties diff --git a/ansible/roles/biocache-properties/tasks/main.yml b/ansible/roles/biocache-properties/tasks/main.yml index 7f27a4740..1044a7930 100644 --- a/ansible/roles/biocache-properties/tasks/main.yml +++ b/ansible/roles/biocache-properties/tasks/main.yml @@ -14,7 +14,7 @@ - biocache-properties - name: copy biocache config properties template - template: src={{item}} dest={{data_dir}}/biocache/config/{{item}} mode=0644 + template: src={{item}} dest={{data_dir}}/biocache/config/{{item}} mode=0644 output_encoding=iso-8859-1 with_items: - biocache-config.properties tags: diff --git a/ansible/roles/collectory/tasks/main.yml b/ansible/roles/collectory/tasks/main.yml index 8406dd2f7..e042dae35 100644 --- a/ansible/roles/collectory/tasks/main.yml +++ b/ansible/roles/collectory/tasks/main.yml @@ -45,7 +45,7 @@ - collectory - name: copy all template configs - template: src={{item}} dest={{ collectory_data_dir }}/config/{{ collectory_app | default('generic-collectory') }}-config.properties + template: src={{item}} dest={{ collectory_data_dir }}/config/{{ collectory_app | default('generic-collectory') }}-config.properties output_encoding=iso-8859-1 with_items: - config/collectory-config.properties tags: diff --git a/ansible/roles/dashboard/tasks/main.yml b/ansible/roles/dashboard/tasks/main.yml index 9ba165118..a668199a9 100644 --- a/ansible/roles/dashboard/tasks/main.yml +++ b/ansible/roles/dashboard/tasks/main.yml @@ -13,7 +13,7 @@ - properties - name: copy all config.properties - template: src=dashboard-config.properties dest={{data_dir}}/dashboard/config/dashboard-config.properties + template: src=dashboard-config.properties dest={{data_dir}}/dashboard/config/dashboard-config.properties output_encoding=iso-8859-1 tags: - dashboard - properties diff --git a/ansible/roles/logger-service/tasks/main.yml b/ansible/roles/logger-service/tasks/main.yml index d8d1935dc..eaedc5314 100644 --- a/ansible/roles/logger-service/tasks/main.yml +++ b/ansible/roles/logger-service/tasks/main.yml @@ -53,7 +53,7 @@ - properties - name: copy all config.properties - template: src=logger-config.properties dest={{data_dir}}/logger/config/logger-config.properties + template: src=logger-config.properties dest={{data_dir}}/logger/config/logger-config.properties output_encoding=iso-8859-1 tags: - logger-service - properties diff --git a/ansible/roles/regions/tasks/main.yml b/ansible/roles/regions/tasks/main.yml index 2ecae33e5..faa6e0f05 100644 --- a/ansible/roles/regions/tasks/main.yml +++ b/ansible/roles/regions/tasks/main.yml @@ -44,7 +44,7 @@ - regions - name: copy all config.properties - template: src=regions-config.properties dest={{data_dir}}/{{regions}}/config/{{regions_config}} force=yes + template: src=regions-config.properties dest={{data_dir}}/{{regions}}/config/{{regions_config}} force=yes output_encoding=iso-8859-1 tags: - properties - regions diff --git a/ansible/roles/species-list/tasks/main.yml b/ansible/roles/species-list/tasks/main.yml index f597ee2a5..82eed66f9 100644 --- a/ansible/roles/species-list/tasks/main.yml +++ b/ansible/roles/species-list/tasks/main.yml @@ -42,7 +42,7 @@ - properties - name: copy all config.properties - template: src=specieslist-webapp-config.properties dest={{data_dir}}/specieslist-webapp/config/specieslist-webapp-config.properties + template: src=specieslist-webapp-config.properties dest={{data_dir}}/specieslist-webapp/config/specieslist-webapp-config.properties output_encoding=iso-8859-1 tags: - specieslist - properties