diff --git a/roles/debian/ansible_galaxy/tasks/main.yml b/roles/debian/ansible_galaxy/tasks/main.yml index 106943f1d..80508ac43 100644 --- a/roles/debian/ansible_galaxy/tasks/main.yml +++ b/roles/debian/ansible_galaxy/tasks/main.yml @@ -26,6 +26,7 @@ - name: Install ansible-galaxy roles and/or collections. ansible.builtin.command: cmd: "{{ _venv_path }}/bin/ansible-galaxy {{ _galaxy_command }}" + chdir: "/home/{{ _ce_provision_username }}/ce-provision" become: true become_user: "{{ ansible_galaxy.username }}" @@ -37,7 +38,7 @@ block: - name: Build timers variable. ansible.builtin.set_fact: - _galaxy_upgrade_timer: "{'{{ ansible_galaxy.upgrade_galaxy.name }}_ansible_galaxy_upgrades': { timer_command: '{{ _venv_path }}/bin/ansible-galaxy {{ _galaxy_command }}', timer_OnCalendar: '{{ ansible_galaxy.upgrade_galaxy.on_calendar }}' }}" + _galaxy_upgrade_timer: "{'{{ ansible_galaxy.upgrade_galaxy.name }}_ansible_galaxy_upgrades': { timer_command: 'cd /home/{{ _ce_provision_username }}/ce-provision && {{ _venv_path }}/bin/ansible-galaxy {{ _galaxy_command }}', timer_OnCalendar: '{{ ansible_galaxy.upgrade_galaxy.on_calendar }}' }}" - name: Turn the timer string into a dictionary. ansible.builtin.set_fact: diff --git a/roles/debian/gpg_key/tasks/main.yml b/roles/debian/gpg_key/tasks/main.yml index 9d954df80..54c8c96d5 100644 --- a/roles/debian/gpg_key/tasks/main.yml +++ b/roles/debian/gpg_key/tasks/main.yml @@ -1,4 +1,9 @@ --- +- name: Ensure GPG is installed. + ansible.builtin.apt: + name: gpg + state: present + - name: Generate GPG key. ansible.builtin.include_tasks: gpg.yml with_items: "{{ gpg_key }}"