From 73a3dea47dd362b0a9884e58bb46ea3475cef49d Mon Sep 17 00:00:00 2001 From: Lee Goolsbee Date: Thu, 10 Sep 2020 12:21:15 -0500 Subject: [PATCH] remove a few straggling references to linking fonts to the JRE --- group_vars/aws_node_local.yml | 2 +- roles/confluence_config/tasks/amazon_fonts.yml | 4 ++-- roles/confluence_config/tasks/ubuntu_fonts.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/group_vars/aws_node_local.yml b/group_vars/aws_node_local.yml index e677015..9db7661 100644 --- a/group_vars/aws_node_local.yml +++ b/group_vars/aws_node_local.yml @@ -35,7 +35,7 @@ atl_product_installation_current: "{{ atl_product_installation_base }}/current" atl_installer_temp: "{{ atl_installation_base }}/tmp" # NOTE: If using the non-installer java we expect to have the full JDK -# installed and linked to `/usr/lib/jvm/java` and # `/usr/lib/jvm/jre`. +# installed and linked to `/usr/lib/jvm/java`. # See product_common/task/ubuntu.yml for an example of apropriate # linking using `alternatives`. atl_java_home: "{{ '/usr/lib/jvm/java' if atl_use_system_jdk else (atl_product_installation_current + '/jre') }}" diff --git a/roles/confluence_config/tasks/amazon_fonts.yml b/roles/confluence_config/tasks/amazon_fonts.yml index 4fc5302..8fa2bda 100644 --- a/roles/confluence_config/tasks/amazon_fonts.yml +++ b/roles/confluence_config/tasks/amazon_fonts.yml @@ -5,8 +5,8 @@ name: - "google-noto-*" -- name: Link the language fonts into the JDK/JRE - # Not idiomatic, but cleaner that messing with nested lookups... +- name: Link the language fonts into the JDK + # Not idiomatic, but cleaner than messing with nested lookups... shell: cmd: "ln -sf /usr/share/fonts/google-noto*/* {{ item }}/" creates: "{{ item }}/NotoSansJavanese-Regular.ttf" diff --git a/roles/confluence_config/tasks/ubuntu_fonts.yml b/roles/confluence_config/tasks/ubuntu_fonts.yml index 084aa3f..20fcbb1 100644 --- a/roles/confluence_config/tasks/ubuntu_fonts.yml +++ b/roles/confluence_config/tasks/ubuntu_fonts.yml @@ -5,8 +5,8 @@ name: - "fonts-noto" -- name: Link the language fonts into the JDK/JRE - # Not idiomatic, but cleaner that messing with nested lookups... +- name: Link the language fonts into the JDK + # Not idiomatic, but cleaner than messing with nested lookups... shell: cmd: "ln -sf /usr/share/fonts/truetype/noto/* {{ item }}/" creates: "{{ item }}/NotoSansJavanese-Regular.ttf"