diff options
| author | Egor Tensin <egor@tensin.name> | 2024-03-18 09:50:04 +0100 |
|---|---|---|
| committer | Egor Tensin <egor@tensin.name> | 2024-03-18 09:50:04 +0100 |
| commit | b2c318a65d723973d01b7ad1468e9759d4ce83f7 (patch) | |
| tree | f7e31173e131024bff84a9f0a97af4923fbaf97d | |
| parent | apt_repo: install apt-transport-https (diff) | |
| download | infra-ansible-b2c318a65d723973d01b7ad1468e9759d4ce83f7.tar.gz infra-ansible-b2c318a65d723973d01b7ad1468e9759d4ce83f7.zip | |
apt_repo: apt_repo_distro -> apt_repo_codename
| -rw-r--r-- | roles/apt_repo/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/apt_repo/templates/repo.list.j2 | 2 | ||||
| -rw-r--r-- | roles/ppa/tasks/main.yml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/roles/apt_repo/defaults/main.yml b/roles/apt_repo/defaults/main.yml index f3bebfb..d4f4d2b 100644 --- a/roles/apt_repo/defaults/main.yml +++ b/roles/apt_repo/defaults/main.yml @@ -1,7 +1,7 @@ #apt_repo_name: #apt_repo_url: #apt_repo_key_url: -#apt_repo_distro: +#apt_repo_codename: # This is a fairly common "component" part value in the repository file. apt_repo_component: main diff --git a/roles/apt_repo/templates/repo.list.j2 b/roles/apt_repo/templates/repo.list.j2 index d7c8138..6bb03b7 100644 --- a/roles/apt_repo/templates/repo.list.j2 +++ b/roles/apt_repo/templates/repo.list.j2 @@ -1,3 +1,3 @@ {{ ansible_managed | comment }} -deb [signed-by={{ apt_repo_key_path }}] {{ apt_repo_url }} {{ apt_repo_distro | default(ansible_distribution_release) }} {{ apt_repo_component }} +deb [signed-by={{ apt_repo_key_path }}] {{ apt_repo_url }} {{ apt_repo_codename | default(ansible_distribution_release) }} {{ apt_repo_component }} diff --git a/roles/ppa/tasks/main.yml b/roles/ppa/tasks/main.yml index 083acdd..a3c3312 100644 --- a/roles/ppa/tasks/main.yml +++ b/roles/ppa/tasks/main.yml @@ -23,4 +23,4 @@ apt_repo_name: '{{ ppa_name }}' apt_repo_key_url: 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x{{ ppa_key }}' apt_repo_url: 'https://ppa.launchpadcontent.net/{{ ppa_owner }}/{{ ppa_name }}/ubuntu' - apt_repo_distro: '{{ ppa_distro }}' + apt_repo_codename: '{{ ppa_distro }}' |