From ab21001525b4a99fad7d581bad9cc49c1b3f0729 Mon Sep 17 00:00:00 2001 From: Michael Schmitz Date: Tue, 8 Oct 2024 15:05:25 +0200 Subject: [PATCH] [#188360028] Update default variables + Readme --- README.md | 12 ++++++++++-- defaults/main.yml | 22 ++++++++++++++-------- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 00b67d8..1a175de 100644 --- a/README.md +++ b/README.md @@ -37,8 +37,16 @@ Example Playbook vars: OPS_TOOLS: apt_repos: - - key_url: "https://s3.amazonaws.com/download.draios.com/DRAIOS-GPG-KEY.public" - repo_line: "deb http://download.draios.com/stable/deb stable-$(ARCH)/" + - key_url: https://haproxy.debian.net/bernat.debian.org.gpg + key_file: /usr/share/keyrings/haproxy.debian.net.gpg + repo_line: 'deb [signed-by=/usr/share/keyrings/haproxy.debian.net.gpg] http://haproxy.debian.net bookworm-backports-2.8 main' + deb822_repository: + name: haproxy + types: deb + uris: http://haproxy.debian.net + suites: "{{ ansible_distribution_release }}-backports-2.8" + components: main + signed_by: https://haproxy.debian.net/bernat.debian.org.gpg tools: - sysstat - iotop diff --git a/defaults/main.yml b/defaults/main.yml index b024ffb..f18f278 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,18 +1,24 @@ --- _ops_tools: + # credentials: + # base_name: "draios" + # machine: "download.draios.com" + # login: "username" + # password: "" apt_repos: - - key_url: "https://s3.amazonaws.com/download.draios.com/DRAIOS-GPG-KEY.public" - repo_line: "deb http://download.draios.com/stable/deb stable-$(ARCH)/" - # credentials: - # base_name: "draios" - # machine: "download.draios.com" - # login: "username" - # password: "" - + - key_url: https://haproxy.debian.net/bernat.debian.org.gpg + repo_line: 'deb [signed-by=/usr/share/keyrings/haproxy.debian.net.gpg] http://haproxy.debian.net bookworm-backports-2.8 main' # - ppa: "ppa:.../..." # - key_id: abc321 # keyserver="keyserver.ubuntu.com" + # deb822_repository: + # name: haproxy + # types: deb + # uris: http://haproxy.debian.net + # suites: "{{ ansible_distribution_release }}-backports-2.8" + # components: main + # signed_by: https://haproxy.debian.net/bernat.debian.org.gpg tools: - iotop - sysstat