From 3a0b6aaa2f0c4c9d19e5f287409a764a2639635f Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Tue, 4 Jun 2024 20:59:17 +0200 Subject: make base url for some repos configurable --- inventory/group_vars/chaos-at-home/vars.yml | 3 +++ roles/apt-repo/docker-com/defaults/main.yml | 2 ++ roles/apt-repo/docker-com/tasks/main.yml | 2 +- roles/apt-repo/kubernetes/defaults/main.yml | 2 ++ roles/apt-repo/kubernetes/tasks/main.yml | 2 +- roles/apt-repo/spreadspace/defaults/main.yml | 2 ++ roles/apt-repo/spreadspace/tasks/main.yml | 2 +- 7 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 roles/apt-repo/docker-com/defaults/main.yml create mode 100644 roles/apt-repo/kubernetes/defaults/main.yml diff --git a/inventory/group_vars/chaos-at-home/vars.yml b/inventory/group_vars/chaos-at-home/vars.yml index 645d1c0f..d5ee34e3 100644 --- a/inventory/group_vars/chaos-at-home/vars.yml +++ b/inventory/group_vars/chaos-at-home/vars.yml @@ -4,6 +4,9 @@ zsh_banner: chaos-at-home acme_account_email: admin@chaos-at-home.org apt_repo_provider: chaos-at-home-cache +docker_com_apt_repo_baseurl: http://apt.chaos-at-home.org/docker-com +kubernetes_apt_repo_baseurl: http://apt.chaos-at-home.org/kubernetes +spreadspace_apt_repo_baseurl: http://apt.chaos-at-home.org/spreadspace apt_repo_blackmagic_auth: username: "chaos-at-home" diff --git a/roles/apt-repo/docker-com/defaults/main.yml b/roles/apt-repo/docker-com/defaults/main.yml new file mode 100644 index 00000000..a075c9cc --- /dev/null +++ b/roles/apt-repo/docker-com/defaults/main.yml @@ -0,0 +1,2 @@ +--- +docker_com_apt_repo_baseurl: "https://download.docker.com/linux" diff --git a/roles/apt-repo/docker-com/tasks/main.yml b/roles/apt-repo/docker-com/tasks/main.yml index c63fdb37..7a1b907c 100644 --- a/roles/apt-repo/docker-com/tasks/main.yml +++ b/roles/apt-repo/docker-com/tasks/main.yml @@ -14,7 +14,7 @@ - name: add repository entry copy: content: | - deb [signed-by=/etc/apt/keyrings/docker-com.gpg] https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} stable + deb [signed-by=/etc/apt/keyrings/docker-com.gpg] {{ docker_com_apt_repo_baseurl }}/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} stable dest: /etc/apt/sources.list.d/docker-com.list register: apt_repo_docker_com_sources diff --git a/roles/apt-repo/kubernetes/defaults/main.yml b/roles/apt-repo/kubernetes/defaults/main.yml new file mode 100644 index 00000000..486c457a --- /dev/null +++ b/roles/apt-repo/kubernetes/defaults/main.yml @@ -0,0 +1,2 @@ +--- +kubernetes_apt_repo_baseurl: "https://pkgs.k8s.io/core:/stable:" diff --git a/roles/apt-repo/kubernetes/tasks/main.yml b/roles/apt-repo/kubernetes/tasks/main.yml index e2f0444b..9198cb10 100644 --- a/roles/apt-repo/kubernetes/tasks/main.yml +++ b/roles/apt-repo/kubernetes/tasks/main.yml @@ -8,7 +8,7 @@ - name: add repository entry copy: content: | - deb [signed-by=/etc/apt/keyrings/kubernetes.gpg] https://pkgs.k8s.io/core:/stable:/v{{ ([0, 1] | map('extract', kubernetes_version.split('.'))) | join('.') }}/deb/ / + deb [signed-by=/etc/apt/keyrings/kubernetes.gpg] {{ kubernetes_apt_repo_baseurl }}/v{{ ([0, 1] | map('extract', kubernetes_version.split('.'))) | join('.') }}/deb/ / dest: /etc/apt/sources.list.d/kubernetes.list register: apt_repo_kubernetes_sources diff --git a/roles/apt-repo/spreadspace/defaults/main.yml b/roles/apt-repo/spreadspace/defaults/main.yml index 4a497ae4..0de65a6a 100644 --- a/roles/apt-repo/spreadspace/defaults/main.yml +++ b/roles/apt-repo/spreadspace/defaults/main.yml @@ -1,3 +1,5 @@ --- +spreadspace_apt_repo_baseurl: "https://build.spreadspace.org/" + spreadspace_apt_repo_components: - main diff --git a/roles/apt-repo/spreadspace/tasks/main.yml b/roles/apt-repo/spreadspace/tasks/main.yml index 0b4dac67..8351d12d 100644 --- a/roles/apt-repo/spreadspace/tasks/main.yml +++ b/roles/apt-repo/spreadspace/tasks/main.yml @@ -14,7 +14,7 @@ - name: add repository entry copy: content: | - deb [signed-by=/etc/apt/keyrings/spreadspace.gpg] https://build.spreadspace.org/ {{ ansible_distribution_release }} {{ spreadspace_apt_repo_components | join(' ') }} + deb [signed-by=/etc/apt/keyrings/spreadspace.gpg] {{ spreadspace_apt_repo_baseurl }} {{ ansible_distribution_release }} {{ spreadspace_apt_repo_components | join(' ') }} dest: /etc/apt/sources.list.d/spreadspace.list register: apt_repo_spreadspace_sources -- cgit v1.2.3