diff --git a/inventory.yaml b/ansible/inventory.yaml similarity index 100% rename from inventory.yaml rename to ansible/inventory.yaml diff --git a/playbook.yaml b/ansible/playbook.yaml similarity index 80% rename from playbook.yaml rename to ansible/playbook.yaml index 5f4e2e1..eefda05 100644 --- a/playbook.yaml +++ b/ansible/playbook.yaml @@ -14,7 +14,7 @@ backup: true become: true notify: - - restart ssh + - Restart SSH - name: Update authorized SSH keys for Ansible user ansible.builtin.copy: dest: '/home/{{ ansible_user }}/.ssh/authorized_keys' @@ -23,6 +23,13 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJEmkV9arotms79lJPsLHkdzAac4eu3pYS08ym0sB/on qenya@tohru ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFjBuuxo+w3yED0aPnsNb8S90p/GgBqFEG9K4ETZ5Wkq qenya@kilgharrah mode: "0600" + + handlers: + - name: Restart SSH + ansible.builtin.service: + name: sshd + state: restarted + - name: Enable automatic upgrades hosts: ovh tasks: @@ -47,8 +54,17 @@ state: started become: true - handlers: - - name: Restart SSH - ansible.builtin.service: - name: sshd - state: restarted +- name: Set up Podman + hosts: ovh + tasks: + - name: Install Podman + ansible.builtin.dnf: + name: podman + state: present + become: true + - name: Enable a Podman socket to receive remote client commands + ansible.builtin.systemd_service: + name: 'podman.socket' + enabled: true + state: started + scope: user diff --git a/hosts/tohru/default.nix b/hosts/tohru/default.nix index 52f2c6a..b1e5bf9 100644 --- a/hosts/tohru/default.nix +++ b/hosts/tohru/default.nix @@ -55,6 +55,8 @@ in scoutshonour.digital-a-love-story scoutshonour.dont-take-it-personally-babe ]; + + services.podman.enable = true; }; qenya.services.distributed-builds = { diff --git a/keys.nix b/keys.nix index cba8c49..9b28be9 100644 --- a/keys.nix +++ b/keys.nix @@ -12,6 +12,7 @@ kilgharrah = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOgGF3gzzlMbxxk3UAAgHJ7sDdjqtrw7UW16M1XhXtz2 root@kilgharrah"; elucredassa = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA+Y/vqGNc1wXUAg4XMAAcLupkggywj2LpYDwA16ONbH root@elucredassa"; carter = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEHHHYG6A995Po05+JXQsvB79ZoIiSOJnW6AiJgVYPic root@carter"; + siberys = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICF9p2X9Mph+PYV1YZHuMXXBevJatecqx3yr/B8znQud root@vps-9fd2f351.vps.ovh.net"; }; users = {