diff --git a/vars/debian.yml b/vars/debian.yml index e77de8a..bea7f7b 100644 --- a/vars/debian.yml +++ b/vars/debian.yml @@ -18,7 +18,9 @@ cache_timeout: 600 haproxy_distro_packages: - haproxy - - "{{ (ansible_facts['distribution_release'] == 'bookworm') | ternary('netcat-openbsd', 'netcat') }}" # Used for the Ansible haproxy module + - "{{ (ansible_facts['distribution_release'] == 'bookworm' or + ansible_facts['distribution_release'] == 'noble') + | ternary('netcat-openbsd', 'netcat') }}" # Used for the Ansible haproxy module - psmisc - vim-haproxy diff --git a/vars/ubuntu.yml b/vars/ubuntu.yml deleted file mode 100644 index ab470eb..0000000 --- a/vars/ubuntu.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -# Copyright 2016, Rackspace US, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -## APT Cache options -cache_timeout: 600 - -haproxy_distro_packages: - - haproxy - - netcat # Used for the Ansible haproxy module - - psmisc - - vim-haproxy - -haproxy_distro_certbot_packages: - - certbot - -# Set system CA store which can be used to verify backends -haproxy_system_ca: /etc/ssl/certs/ca-certificates.crt