diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2023-08-21 02:05:00 +0200 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2023-08-21 02:05:00 +0200 |
| commit | ed54c4c9499e2b5d45427f6cd2978de2b3bd9784 (patch) | |
| tree | c0735f8cc5870826aed9eede85f9e9fe3b22120d /roles/apt_repo | |
| parent | v0.0.18 (diff) | |
| download | infra-ansible-ed54c4c9499e2b5d45427f6cd2978de2b3bd9784.tar.gz infra-ansible-ed54c4c9499e2b5d45427f6cd2978de2b3bd9784.zip | |
add input variables to role's defaults/
Diffstat (limited to '')
| -rw-r--r-- | roles/apt_repo/defaults/main.yml | 7 | ||||
| -rw-r--r-- | roles/apt_repo/tasks/main.yml | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/roles/apt_repo/defaults/main.yml b/roles/apt_repo/defaults/main.yml index f4755e5..51847eb 100644 --- a/roles/apt_repo/defaults/main.yml +++ b/roles/apt_repo/defaults/main.yml @@ -1,4 +1,7 @@ -apt_repo_keys_dir: /etc/apt/keyrings +#apt_repo_name: +#apt_repo_key_url: apt_repo_key_dearmor: false - +#apt_repo_distro: apt_repo_component: main + +apt_repo_keys_dir: /etc/apt/keyrings diff --git a/roles/apt_repo/tasks/main.yml b/roles/apt_repo/tasks/main.yml index bf9e3ea..f382f6a 100644 --- a/roles/apt_repo/tasks/main.yml +++ b/roles/apt_repo/tasks/main.yml @@ -5,7 +5,7 @@ # running `gpg --dearmor`, you must save it with the .gpg extension # instead of .asc. You can then completely skip the gpg step. Source: # https://stackoverflow.com/q/71585303/514684 - apt_repo_key_path: '{{ apt_repo_keys_dir }}/{{ apt_repo_name }}{{ apt_repo_key_dearmor | ternary(".gpg", ".asc") }}' + key_path: '{{ apt_repo_keys_dir }}/{{ apt_repo_name }}{{ apt_repo_key_dearmor | ternary(".gpg", ".asc") }}' block: - name: Create keys directory ansible.builtin.file: @@ -16,7 +16,7 @@ - name: 'Add key: {{ apt_repo_name }}' ansible.builtin.get_url: url: '{{ apt_repo_key_url }}' - dest: '{{ apt_repo_key_path }}' + dest: '{{ key_path }}' mode: '644' - name: Get host distro @@ -25,7 +25,7 @@ - name: 'Add repository: {{ apt_repo_name }}' ansible.builtin.apt_repository: - repo: 'deb [signed-by={{ apt_repo_key_path }}] {{ apt_repo_url }} {{ distro }} {{ apt_repo_component }}' + repo: 'deb [signed-by={{ key_path }}] {{ apt_repo_url }} {{ distro }} {{ apt_repo_component }}' filename: '{{ apt_repo_name }}' vars: distro: '{{ apt_repo_distro | default(ansible_distribution_release) }}' |